8004e096fd
MR 28 and minor fixes
...
Former-commit-id: 99292ecb6401cf20066dd09188a32e24b9194b25
2019-05-14 18:09:34 +02:00
3548070ec1
Merge branch 'ent-4020-cambiar-mensaje-de-bienvenida-tnews' into 'develop'
...
Add new message to News board
See merge request artica/pandorafms!2415
Former-commit-id: b0adfc73ac247cda59dea01e83429e06ba5747ee
2019-05-14 17:56:43 +02:00
920786216b
UM notifications MR update
...
Former-commit-id: 61be93c1174fbff4242e261caac591725d7ef4c5
2019-05-14 17:17:04 +02:00
53e9113b7e
UM notifications MR update
...
Former-commit-id: d2aad195cb9bab4e1efa504cb4b4a583f262f0e3
2019-05-14 17:15:28 +02:00
d9dbc60eb5
Update pandoradb_migrate_6.0_to_7.0.mysql.sql
...
Former-commit-id: cb2edea9dca48e33260ce2fb707ed48b04d23bde
2019-05-14 16:45:28 +02:00
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
b89751e647
Merge branch 'develop' into ent-3468-Ayudas_online
...
Conflicts:
pandora_console/godmode/alerts/configure_alert_command.php
Former-commit-id: 9051a95f31fd7163a0b326d7e513c5689c5b304f
2019-05-14 11:50:07 +02:00
cf45be2c60
Merge branch 'develop' into 'ent-4020-cambiar-mensaje-de-bienvenida-tnews'
...
# Conflicts:
# pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
Former-commit-id: b3872691ef8ef136cd921c5eb4365be2b32daf46
2019-05-14 10:03:37 +02:00
9501187ebc
Se cambian las consultas sql sin la imagen en la consulta
...
Former-commit-id: fcfc9e05c4107f5b85b1a8f6140155fafe316c8e
2019-05-14 10:01:30 +02:00
860a4cdbf2
Updated pandoradb and migrate
...
Former-commit-id: 59d37439046c18c4de72ac7e078ef75a61603958
2019-05-13 17:57:21 +02:00
8c1c337522
Merge remote-tracking branch 'origin/develop' into ent-3924-eHorus-settings
...
Former-commit-id: 1eac76c75f311a20f402859cf7b9a47b70765f75
2019-05-13 17:36:32 +02:00
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
20dace7de8
Merge branch 'develop' into ent-3468-Ayudas_online
...
Conflicts:
pandora_console/godmode/agentes/agent_manager.php
Former-commit-id: c53d6c5819284e92caae040c52c6da477c27a2f3
2019-05-13 16:20:12 +02:00
17ba0e19cb
Added new min value for <code>InnoDB file per table( 0 to 1)
...
Former-commit-id: ac389928deec2fdc8af9d965c049a66f0fe57839
2019-05-13 15:08:57 +02:00
27096276ec
agent view user acces ehorus
...
Former-commit-id: 66739ce807d5bd5f2e46ce9fd1aa0cc72afbb4bc
2019-05-13 15:00:29 +02:00
ac60e296c1
Add new message to News board
...
Former-commit-id: ad9170857d95fa2c211d09a5f59f6012739177c5
2019-05-10 11:17:46 +02:00
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
8027238dfd
Merge branch 'ent-3925-eliminar-custom-response-deprecated' into 'develop'
...
Ent 3925 eliminar custom response deprecated
See merge request artica/pandorafms!2390
Former-commit-id: aa92dfe86b9039f45db063cd1a711b26e8c36442
2019-05-09 17:52:46 +02:00
5126c651f7
Changed '' of query
2019-05-09 17:38:40 +02:00
f186cd6201
Added cache_expiration in mr, pandoradb and migrate
2019-05-09 17:37:01 +02:00
ad00492ad6
se elimina la query del 27
...
Former-commit-id: 1756d296ad9c13c62c4eb46a854291dfc4200256
2019-05-06 18:23:12 +02:00
e1951c45a4
Se añade al 28
...
Former-commit-id: 1607d9cbc88fe0e029df46ada20046899558829e
2019-05-06 18:06:59 +02:00
c5884f1ac9
add changes sql for mr 28
...
Former-commit-id: 0650b5ec91188a854fb756d7c2d8b1b8eccc3e0d
2019-05-03 14:09:23 +02:00
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
1d4e8c9bed
Changed translations strings
...
Former-commit-id: b802cc7a3650a1697ec0f192cbb374fce3ffea56
2019-04-29 15:17:59 +02:00
6bd8221bc0
changed helps
...
Former-commit-id: 3319f3d09d695e2b9f2958f1ac013eb2e0a001b4
2019-04-29 14:36:02 +02:00
c5c84d7421
Deleted row Integria IMS incident from event on tevent_responoses
...
Former-commit-id: 76e41297003d537f8b0ea74394dd433e71ca2976
2019-04-29 12:32:06 +02:00
c075d5caad
Added condition type not normal in alert templates
...
Former-commit-id: c2028e4c64e4126768f33f73edb93b39fdf6a79d
2019-04-24 10:51:55 +02:00
bbedf36235
minor update
...
Former-commit-id: da7ef108bd3b71ece515407fb932e6b9bef761fd
2019-04-23 16:28:22 +02:00
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
d3d5312f40
Update 27.sql
...
Former-commit-id: 4e027274bb9edeb51dc64f935ddd3ee2bfd62d0d
2019-04-15 11:14:41 +02:00
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
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
79bd37ee5b
Merge remote-tracking branch 'origin/develop' into ent-3674-discovery-fase-3
...
Former-commit-id: 8310dd36684192ea6e98d3a0c0a3e7ace69485d7
2019-04-08 16:28:26 +02:00
49d925d96a
Merge remote-tracking branch 'origin/develop' into ent-3445-Solucionar_problematica_flip_flop
...
Conflicts:
pandora_console/extras/mr/27.sql
Former-commit-id: 67c41a5bd6a4c95647b097171578c5af67b491fa
2019-04-05 16:48:58 +02:00
49c913c6de
Added custom fields to report templates
...
Former-commit-id: 525d21d17835a3bb08f47df273128e658a35bcd9
2019-04-04 17:31:11 +02:00
798a2aad16
WIP discovery F3
...
Former-commit-id: 19570468cf4de9f600ab9a01468d1e59c69e6939
2019-04-03 18:13:19 +02:00
11b2fbc245
WIP db
...
Former-commit-id: 3c231b9d90dc6c9fae5e7e398e829c8c28ffeed9
2019-04-02 16:25:29 +02:00
1fd40447e1
Custom fields in availability report type
...
Former-commit-id: 1f04e5728cf7d0ed5079c16488493188379d536c
2019-04-02 16:24:29 +02:00
431c807f61
Merge branch 'develop' into 'ent-3445-Solucionar_problematica_flip_flop'
...
# Conflicts:
# pandora_console/extras/mr/27.sql
Former-commit-id: 4fcd03764bf959fb6b126df48e20bc29327105b2
2019-04-02 10:21:04 +02:00
6733182b5d
Merge branch 'ent-3757-Errores-en-diagnostic-info' into 'develop'
...
Fixed errors in Diagnostic tool
See merge request artica/pandorafms!2292
Former-commit-id: 62fafd92e852c65136c50a3c0ff6d80a3edf72b8
2019-04-01 18:39:12 +02:00
2afc16c8dc
Merge branch 'ent-1901-Enviar-reportes-por-mail-en-otros-formatos-que-no-sean-PDF' into 'develop'
...
Ent 1901 enviar reportes por mail en otros formatos que no sean pdf
See merge request artica/pandorafms!2272
Former-commit-id: 590eddf946623393d02a8c88db33fde2af022937
2019-04-01 17:51:37 +02:00
48c4eb9c01
Add changes in migrate and 27.sql file
...
Former-commit-id: 60c2e2f2dc9a78ff9fb236efe7ac57a288d3717a
2019-03-29 13:58:53 +01:00
e3222626dc
fixed error in bbdd
...
Former-commit-id: dddd4fc90a4d3847c04108ba4dcdd4988872066f
2019-03-28 09:49:16 +01:00
626aacbf43
Merge remote-tracking branch 'origin/develop' into ent-3445-Solucionar_problematica_flip_flop
...
Former-commit-id: 26e21338ea5e7578a4247771d19df75d01e6234e
2019-03-28 08:49:08 +01:00
a3865a3181
flip flop keep counters
...
Former-commit-id: 0d39875c7a78f4be07fdffcf76a686007333c626
2019-03-27 18:16:53 +01:00
128a97d254
fix mr 26
...
Former-commit-id: 72c38dbc1bc8ac4973d6f19cf111ce107497e4ef
2019-03-27 17:38:08 +01:00
66b2102052
Merge remote-tracking branch 'origin/develop' into fix/mr
...
Former-commit-id: a95ef0c2110e1c0b7be3e9c6cd93543f79e0f230
2019-03-27 17:09:46 +01:00
6ebbe54448
minor fix
...
Former-commit-id: 252895bd6c64e5a1cb593ba705fb15a2ec6bed97
2019-03-27 17:06:14 +01:00
160a72d780
Merge branch 'fix/delete' into 'develop'
...
errata fix
See merge request artica/pandorafms!2303
Former-commit-id: 2dc2834075b9491712dbd37ac087b9e20c274059
2019-03-27 16:51:19 +01:00
2dd427100e
errata fix
...
Former-commit-id: 3e4ce53635dc02387ec1d2d46698fa4a81372dd0
2019-03-27 16:44:08 +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
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
34b057befd
Fixed errors in Diagnostic tool
...
Former-commit-id: a82e827df2266c0962df62ee44ad35dc1e0d04d6
2019-03-26 11:18:15 +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
af9936c78f
Merge remote-tracking branch 'origin/develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
...
Conflicts:
pandora_console/install.php
Former-commit-id: 13c6146ea07be2c0d1bb571e70c644f1f68ae2bc
2019-03-21 13:26:55 +01:00
6fb6963501
Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
...
Former-commit-id: 9df9a4c3a4a50e191af5167129df1352e712171e
2019-03-20 17:40:08 +01:00
a0f4163c1d
Fix netflow filters on database
...
Former-commit-id: ae1326117f0a78f2234485f1a260df2923e6ce6b
2019-03-20 17:19:56 +01:00
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
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
daf72a4bac
fixed errors delete files update manager open and metaconsole
...
Former-commit-id: 1ebff30c092290b3e65e639d94c6920afed960c0
2019-03-20 13:35:24 +01:00
531f98f06b
Redolved ticket
...
Former-commit-id: e0f8890e8810228d9c1b74de3a689f7b411a59c1
2019-03-19 18:44:35 +01:00
bc9192b98a
[Netflow] Merge three reports in one
...
Former-commit-id: 1a7fb1aaacda5009ba2ab911dc69594133517f91
2019-03-19 17:33:39 +01:00
6121c2a32b
Added types reports to send email
...
Former-commit-id: 7d2f349c47d81de454cb5464146d4f0ac2fc3fb6
2019-03-19 17:16:31 +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
15ca89068d
Merge remote-tracking branch 'origin/develop' into ent-3084-Warnings_en_PHP_7
...
Conflicts:
pandora_console/godmode/servers/manage_recontask_form.php
pandora_console/include/functions_events.php
Former-commit-id: 7ea5c9dcc8efe112ea64e2fcb6eef9670c9af613
2019-03-12 13:07:12 +01:00
b19161ed3c
Merge branch 'ent-2687-Añadir-nuevo-custom-field-de-agente-de-tipo-combo' into 'develop'
...
Added custom field combo values in agent custom field
See merge request artica/pandorafms!2246
Former-commit-id: 3dbf90c17c8964761a53b062a1b9144196ec3cba
2019-03-08 10:34:44 +01:00
c41c9d10e0
Changed sql files
...
Former-commit-id: b9b20d2a5aee08ca1638df9bdb8e16c3b693d47b
2019-03-08 10:01:55 +01:00
dd8265f65e
Merge branch 'develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
...
Former-commit-id: 65d43e483dc23616c44da3b26b73c94cbf10d3fe
2019-03-08 09:02:22 +01:00
d4f5482e99
Added custom field combo values in agent custom field
...
Former-commit-id: 55ca33d3de14c868e1eec3f32179b33dc3ff589b
2019-03-07 13:37:36 +01:00
b9357b6b73
Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
...
Former-commit-id: 275cfc7046e2155a6b9d1860372f59cc175924c8
2019-03-06 18:02:47 +01:00
9152e2f236
Merge branch 'ent-3504-Bug-pandoradbmigrate' into 'develop'
...
add changes to migrate script
See merge request artica/pandorafms!2214
Former-commit-id: 24ef182bbdf7b7daabb613e865c88befaec09acc
2019-03-06 14:27:56 +01:00
4943521904
fix pandora migrate script
...
Former-commit-id: 0d66837bf3f842aed32c3c64edc2608580d6ed7f
2019-03-05 15:28:39 +01:00
09897591c3
Add extended events to event reporting tables
...
Former-commit-id: afbf41109bc382c6b26cb0e6b97d5dc3d580c256
2019-03-05 15:03:05 +01:00
287ce78260
Move tnetwork_matrix to mr 26
...
Former-commit-id: 731ffaeb7253345bc83afe645f788e6a130080b4
2019-02-28 18:18:20 +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
e55e47cbfa
change mr
...
Former-commit-id: 4ec37be9caef34e88b3e5ca65bca2c1aee7f03dd
2019-02-27 11:35:00 +01:00
0a37f6d848
add changes to migrate script
...
Former-commit-id: 7e1beeed2a8ff709cdd2e2ff992b610cd4aa7409
2019-02-27 11:32:39 +01:00
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
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
4bf7469565
change mr and migrate for table twidget
...
Former-commit-id: fb7bfc3771b2c019a7e70771d4e5bd47043ba99b
2019-02-25 18:42:52 +01:00
13cbc78fdd
change mr and migrate for table twidget
...
Former-commit-id: d7d07f5e036a8dd81debcb974bd42217e2b59b26
2019-02-25 18:41:24 +01:00
16f1474691
Added models in tlog_graph_models
...
Former-commit-id: 76d6f1358677c02eab4681a1bb290fda0476c91b
2019-02-25 17:45:37 +01:00
d8ee90c285
Merge remote-tracking branch 'origin/develop' into ent-3430-discovery
...
Former-commit-id: cd7b77b0fe8fa41f03024af752b8793ae877de2b
2019-02-25 14:42:48 +01:00
7f01e47e1f
Merge branch '3281-Vista-monitor-detail-personalizar-campos-a-mostrar' into 'develop'
...
ent-3281-Vista-monitor-detail-personalizar-campos-a-mostrar
See merge request artica/pandorafms!2132
Former-commit-id: bebade5b9cd293eb6f062f5b6fb85aaad673a9b8
2019-02-25 13:48:37 +01:00
504a8e9d1a
fixed warnings php
...
Former-commit-id: d21cb02113c65a7f50a5e29f7f536e85ba5cb945
2019-02-25 13:02:39 +01:00
e65d128b25
minor fix db schema
...
Former-commit-id: a4f87c1c7fd9da0f16a37f75cb5029ac6694baef
2019-02-22 12:40:02 +01:00
b1aa0fe2f2
Merge from develop
...
Former-commit-id: 043b38c0e4ea96e0e39cc2480420164dd0f5d3b7
2019-02-22 12:30:27 +01:00
42448cf0d8
Updated path for discovery plugins
...
Former-commit-id: 222373efee3c768619d5f301f3ae291009901e64
2019-02-22 10:41:54 +01:00
2e9322515d
Move network matrix mr
...
Former-commit-id: 18227212ce8961c9dae24939fa364c03e6f7dff8
2019-02-22 08:45:05 +01:00
50155dd10b
Added tnetwork_matrix table
...
Former-commit-id: c933f5c00d68dd459ca15176dbc1a914f2b7ea32
2019-02-21 18:44:40 +01:00
4930968ec9
Merge branch 'develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
...
Conflicts:
pandora_console/godmode/reporting/reporting_builder.item_editor.php
pandora_console/godmode/reporting/reporting_builder.php
pandora_console/include/functions_reporting.php
pandora_console/include/functions_reporting_html.php
pandora_console/include/functions_reports.php
Former-commit-id: 0d4a8390a47b61520aca2637bb500ff8013495fa
2019-02-21 17:21:42 +01:00
e856969a59
Minor fix changed vmware_plugin reference to vmware-plugin
...
Former-commit-id: 20e80bfffaf80583c320aa62d35e54f79e6ab03e
2019-02-21 15:13:27 +01:00
8fb84e910a
Minor SQL fixes discovery
...
Former-commit-id: e2513e61ea6038f0bdb8f009619dcb92f07b992e
2019-02-21 14:29:59 +01:00
1167cfcafc
Minor SQL fixes discovery
...
Former-commit-id: 8d27ac99269f228b7fbb0c46b722bc5ea54c86ab
2019-02-21 14:27:09 +01:00
c12ba3b12e
Minor MR and sql updates - presets
...
Former-commit-id: edf310a362b58c68dcadbb078b899948430f23e3
2019-02-21 13:58:29 +01:00
698451ee98
MR25 Discovery
...
Former-commit-id: 2685a72781173e3d87363fe0bc2b5dd72961cdce
2019-02-21 13:38:58 +01:00
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
eb3adfb6fb
Data update. added recon scripts app.vmware and cloud
...
Former-commit-id: 1fa41a16848794846fee6b5da510bd49aa7b51b1
2019-02-20 17:17:24 +01:00
25f389b325
Merge branch 'develop' into 3193-Mal-unidades-de-tamaño-de-log-en-diagnostic-info
...
Conflicts:
pandora_console/extras/pandora_diag.php
Former-commit-id: d49e9ec693a709661bc69f2b3f4282ccb9a67123
2019-02-18 16:25:30 +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
166c3bbe88
Merge remote-tracking branch 'origin/ent-3430-discovery' into ent-3371-sistema-de-notificaciones-pandora
...
Former-commit-id: d630994f964e43b28197f4d26469fa1484d08ac2
2019-02-12 12:41:11 +01:00
42dc0c60be
supervisor
...
Former-commit-id: cf99e746a02ab3e921a39b19f6b4822580299b7e
2019-02-12 11:41:21 +01:00
d40ced2043
alert_command send notification
...
Former-commit-id: ff0eb13b51cdab9c2d188362da0c8b2c4191b2cf
2019-02-12 11:16:34 +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
7077d5d1ef
Merge remote-tracking branch 'origin/ent-3430-discovery' into ent-3381-eventos-extendidos
...
Former-commit-id: e67aa2dd0d9aac3040bd1708cbf598e6d17dd2c8
2019-02-08 14:02:18 +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
229c60c5cc
Merge branch 'develop' into cursed-format-change
...
Former-commit-id: a3dfd193c81af0ebe0549dc2a9c953aac98b5f68
2019-01-31 09:42:10 +01:00
d0fe6c9ecf
fixed mr token
...
Former-commit-id: ab5615c8eb0f1a2b153934b807d23804f4fd5562
2019-01-30 17:11:48 +01:00
b3da2803a4
Changed the format of the .php files
...
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
2019-01-30 16:18:44 +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
17b2ff2819
Merge branch '3254-error_al_pasar_pandoradb_migrate_6_to_7' into 'develop'
...
fixed error migratesql
See merge request artica/pandorafms!2095
Former-commit-id: 672aed5f3493d7981398af0062a76c9255c0a87a
2019-01-02 11:50:32 +01:00
ed30441f86
fixed error migrate 6 to 7
...
Former-commit-id: 117cd6b7b16e0b8cf0c69f50e87665732e241690
2018-12-28 13:42:40 +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
73d429ff67
fixed error migratesql
...
Former-commit-id: dba8e3108d2160f51aee058735a7822fd722dddb
2018-12-18 12:52:40 +01:00
c5c5ba9403
Fixed bug in diagnostic info
...
Former-commit-id: 0318eabdf8cbf60267667ba1b4d74d8e476d0b3d
2018-12-12 12:21:52 +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
58aa334798
fixed minor errors in graphs an license diag
2018-11-07 13:33:07 +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
2e74cd53f1
Changed tlayout_template name table to varchar 600
2018-10-24 16:50:40 +02:00
9d7f063ef2
Changed tlayout_template name table to varchar 600
2018-10-24 12:39:58 +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
a7918a1816
delete field flash chart php7
2018-10-19 11:56:49 +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
42caddeadd
Modified query to match MR requirements
2018-10-10 14:32:43 +02:00
9b7ae31344
MR change
2018-10-09 16:09:44 +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
1f0feebd1a
Merge branch '2324-Error-en-servidor-de-Pandora-FMS-dev' into 'develop'
...
Update mr and current package
See merge request artica/pandorafms!1807
2018-09-25 13:41:43 +02:00
02f1e4a83a
Update mr and current package
2018-09-25 13:37:47 +02:00
8979890964
Added is_favourite to tservice table
2018-09-18 19:05:20 +02:00
8196ed21df
New mr 21.sql commit
2018-09-18 18:55:53 +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
50a3e43bd4
Insert apache log model in tlog_graph_models
2018-09-17 12:43:51 +02:00
c9af020d91
Remove unwanted git traces on 20.sql
2018-09-17 10:16:12 +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
49f747f739
Fixed visual bug
2018-08-20 10:09:09 +02:00
8a5495a283
Merge branch 'develop' into ent-2335-gis-group-items
2018-08-17 11:17:29 +02:00
7da4557abc
Added the feature of the new map items (groups) and fixed more bugs
2018-08-17 11:07:42 +02:00
4678c0df53
Fixed copy is_secondary to no_hierarchy in mr 19
2018-08-14 14:16:40 +02:00
3daea977b0
Fixed migration rebranding Event commands
2018-08-13 14:10:19 +02:00
6b700d337a
Merge branch '572-Extension-de-self-assestment' into 'develop'
...
Extension self assestment
See merge request artica/pandorafms!1676
2018-08-13 12:56:04 +02:00
962e793c1b
Reupload the manuel.montes changes
2018-08-13 12:52:01 +02:00
837df1f196
Revert "Extension self assestment"
...
This reverts commit de459c7761
2018-08-13 12:49:41 +02:00
9dd9ad71a8
Merge branch '2609-cambios-en-la-forma-de-gestionar-grupos-secundarios-en-la-vista-de-usuario' into 'develop'
...
2609 cambios en la forma de gestionar grupos secundarios en la vista de usuario
See merge request artica/pandorafms!1665
2018-08-13 10:28:14 +02:00
de459c7761
Extension self assestment
2018-08-10 17:56:43 +02:00
bb8fc7a765
fix bug in pandora_diag.php
2018-08-10 10:41:18 +02:00
2c72ec54b8
Update self-assestment
2018-08-09 13:08:08 +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
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
17b726d7a0
changes bd for mr, schema and migrate and update tocken mr
2018-06-21 14:15:27 +02:00
dc103988ae
Fix the current enterprise package number.
2018-06-20 15:18:50 +02:00
7a026bd1c0
Update the MR version.
2018-06-20 14:40:47 +02:00
faccbec12d
Added a new inventory module to the database
2018-06-19 15:55:33 +02:00
04aad98871
Added the database changes for the custom fields of the remote inventory modules
2018-06-19 13:49:36 +02:00
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
6f689f0d0e
Added mr 17 and update migrate
2018-06-13 15:39:31 +02:00
f1807246a1
Changed MR to 16 and current_package_enterprise to 723 for new and migrated installations
2018-05-30 15:49:59 +02:00
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
66dfd9b171
[Rebranding] Change alert action Pandora FMS Event to Monitoring Event
2018-05-24 11:16:30 +02:00
8f2302630c
[Rebranding] Docs and Support login icons are configurables
2018-05-21 14:29:11 +02:00
d76f8f6c76
Fix MR - #2007
2018-04-30 14:59:35 +02:00
6affae9872
drop agents foreign keys in tcluster tables - #2007
2018-04-30 13:06:08 +02:00
1f79326e97
[Secondary groups] Added SQL changes to migrate scripts
2018-04-10 09:38:00 +02:00
364daa8579
Added group_id in cron job(mr and migrate)
2018-03-21 16:51:08 +01:00
928113bf4c
Merge branch '2090-Cambio-id_os-a-100-a-sistema-operativo-asociado-a-cluster' into 'develop'
...
Fix cluster id_os bug - #2090
See merge request artica/pandorafms!1384
2018-03-21 15:49:06 +01:00
19b566d4c2
Fix cluster id_os bug - #2090
2018-03-20 15:42:37 +01:00
a7531bbcb3
Fix migrate clusters id_os bug - #1748
2018-03-20 15:34:23 +01:00
43e374f454
Fix id_os 100 cluster - #1748
2018-03-19 19:09:45 +01:00
458938b751
Fixed mr 13
2018-03-15 14:32:51 +01:00
42107017bf
Merge remote-tracking branch 'origin/develop' into 1873-autoprovisionamiento-de-agentes
2018-03-13 18:40:51 +01:00
560f18f3a2
Add tables for agent provisioning to the schema.
2018-03-13 18:01:04 +01:00
9b9b46ac65
1923 added new tables to MR and migrate sql script
2018-03-13 16:38:09 +01:00
beac30513d
Ad id_os cluster to tconfig_os - #2001
2018-03-01 16:17:26 +01:00
610c5a5147
Updated MR and current_package_enterprise
2018-02-28 15:45:58 +01:00
9d36887a02
Fixed graph precision
2018-02-28 14:33:22 +01:00
a6b28cb40e
Fix MR - #1748
2018-02-13 15:59:30 +01:00
7fd534c68f
Merge branch 'MR-Sistema-de-gestión-de-Clusters' into 'develop'
...
MR 12 clusters - #1748
See merge request artica/pandorafms!1280
2018-02-07 15:41:43 +01:00
c0ee22dbd9
MR 12 clusters - #1748
2018-02-07 15:19:17 +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
6194f84f13
Merge branch '1403-Db-changes-for-clocks-in-visual-console-MR' into 'develop'
...
MR 12 changes for animation clock ticket - #1403
See merge request artica/pandorafms!1274
2018-02-06 11:02:05 +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
65dccd3935
MR 12 changes for cnimation clock ticket - #1403
2018-02-06 10:52:49 +01:00
fb39c1e39b
Updated current_package_enterprise 719 and MR12
2018-02-06 10:27:07 +01:00
0f01fcbd20
Merge branch 'Gráficas-generadas-en-Dynamic-dev' into 'develop'
...
Added type graph selection in container graph
See merge request artica/pandorafms!1113
2018-02-06 09:55:36 +01:00
aea9d6ae36
resolved conflicts with containers and added mr12
2018-02-06 09:21:07 +01:00
2b07a7a8a9
Change po,mo,mr and package - #1257
2018-01-25 15:49:21 +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
934ab8ed91
Add support for periodically updating the status of unknown modules.
2018-01-11 16:00:22 +01:00
b10e9cfc67
fixed errors in favourite consola visual
2018-01-04 13:10:25 +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
410ecab211
fixed error in bbdd tsnmp_filter
2018-01-02 14:49:42 +01:00
ff60278060
fixed error in bbdd tsnmp_filter
2018-01-02 13:54:08 +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
43e697a1cb
Added hint in field Add summatory series
2017-12-13 11:50:15 +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
cf32b4163c
Merge branch '1326/1382-MR-db-changes' into 'develop'
...
1326 / 1382 - Mr 10 changes
See merge request artica/pandorafms!1137
2017-11-30 13:12:41 +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
6075c9b6b9
1326 / 1382 - Mr 10 changes
2017-11-30 11:55:11 +01:00
828d19a47a
Added mr file
2017-11-29 14:00:27 +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
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
b565500182
Added sql to MR
2017-11-16 08:32:39 +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
b5cff77a4f
Added visual console querys
2017-11-15 16:10:43 +01:00
4eae50f0f1
Update pandoradb_migrate_6.0_to_7.0.mysql.sql
2017-11-15 16:03:39 +01:00
a72f7b006e
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
2017-11-15 12:04:11 +01:00
66547d28b0
Updated to MR 9
2017-11-15 11:15:12 +01:00
e8076645d0
Merge branch 'develop' into '1491-Limite-de-caracteres-direcciones-de-email-en-cron-jobs-dev'
...
# Conflicts:
# pandora_console/extras/mr/9.sql
2017-11-15 09:47:21 +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
e6d5adbf22
Changed MR
2017-11-14 10:38:50 +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
baab22bb28
add queries mr8 and migrate
2017-11-07 11:44:09 +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
2da1e57dc1
Change pandora migrate and add mr8 changes - #654
...
Conflicts:
pandora_console/extras/mr/8.sql
2017-10-30 17:26:35 +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
7e6adb5d40
Db changes for tgraph_source field order - #1382
2017-10-24 19:02:16 +02:00
92d2179469
updated version
2017-10-24 17:11:56 +02:00
9b1cbf3c9b
Changed column in tuser_task_scheduled
2017-10-24 13:10:07 +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
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
1838a6b30a
Revert "Merge branch '145-plain-text-mail-cannot-be-send-by-email_mr' into 'develop'"
...
This reverts merge request !863
2017-10-16 16:44:16 +02:00
c86bd5cc3c
Fix pandora diag texts and delete old secitons files - #1350
2017-10-09 15:36:28 +02:00
80495ddaf7
Merge branch '145-plain-text-mail-cannot-be-send-by-email_mr' into 'develop'
...
create mr8 for send mail plain/text
See merge request !863
2017-10-09 10:11:07 +02:00
570a209861
Db maintenance section is now called Admin tools with only admin access permission, erase all subsection except db interface and db status - #1350
2017-10-04 19:02:45 +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
2d673c8ac1
create mr8 for send mail plain/text
2017-09-27 13:46:29 +02:00
8ce6920e44
DB changes for visual console group elements - #1245
2017-09-07 12:11:13 +02:00
f954b92aae
fixed error in mr for WUX
2017-09-05 11:06:49 +02:00
d74a3f74b4
Merge branch 'develop' into 1056-pandora-wux-grid-server
2017-09-01 10:51:54 +02:00
6b4a15534d
Merge branch 'develop' into '1211-Falta-tabla-de-proceso-de-reseteo-de-contraseñas-en-MR'
...
# Conflicts:
# pandora_console/extras/mr/6.sql
2017-08-31 18:21:08 +02:00
afd184f466
Update 6.sql
2017-08-31 17:58:34 +02:00
2fe8849708
Added db changes to mr 6
2017-08-31 11:33:08 +02:00
b078d48918
fixed errors in wux
2017-08-30 09:47:57 +02:00
ae971ded58
Fix on migrate 6.0 to 7.0
2017-08-28 19:15:10 +02:00
2b18b1589c
Added new module type: web_analysis
2017-08-28 19:05:08 +02:00
068be133ed
Add password reset table in MR - #1211
2017-08-28 12:22:59 +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
8232911713
merge develop
2017-08-22 18:39:34 +02:00
870be2c4ea
Merge branch '1191-Fallo-en-base-de-datos-para-actualizar-protección-en-cascada-dev' into 'develop'
...
Fixed issue with cascade_protection_module
See merge request !720
2017-08-18 12:34:31 +02:00
059dec7cc9
Fixed delimiter
2017-08-16 17:04:21 +02:00
bf77ea14d1
Added recover delimiter
2017-08-16 10:36:30 +02:00
47c851be95
Merge branch '1109-mysql-procedure-error-in-pandora-migrate-dev' into 'develop'
...
Added recover delimiter
See merge request !666
2017-08-14 12:25:35 +02:00
1d7d55a451
fixed errors in form wux
2017-08-09 13:27:51 +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
88879462a3
Merge branch 'develop' into '1071-Formulario-gráfica-combinada-automática-open'
...
# Conflicts:
# pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
2017-07-28 10:34:06 +02:00
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
278330e8f6
Added some fixes to reset pass feature
2017-07-19 11:37:17 +02:00
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
f0e43e252c
New feature: Add groups to policies
2017-07-18 12:06:57 +02:00
d594b98cc3
Added recover delimiter
2017-07-18 11:48:59 +02:00
4aa04cfef0
Set texport_server table name field varchar 600 - #1015
2017-07-17 16:19:38 +02:00
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
1ea465b7d4
Added db changes to package 708
2017-07-17 10:46:26 +02:00
e6e993538b
Add historical db check to reports template SQL items - #853
2017-07-03 10:38:04 +02:00
342db3c4fb
Add column id_server to tgraph_source and fix metaconsole automatic_graph report_template - #1071
2017-06-29 17:33:29 +02:00
7e383262bb
Change tserver_export_data to varchar 600 - #1015
2017-06-20 13:56:20 +02:00
035829ce91
Replaced procedures with prepared statements.
...
The Update Manager client cannot load MySQL procedures because the
parser breaks them.
2017-06-15 15:43:00 +02:00
d2d56b4b89
Add a missing MR.
2017-06-15 13:47:20 +02:00
7c3ef317b0
Revert "Add a missing MR."
...
This reverts commit 16b0da1515
2017-06-15 10:50:31 +02:00
16b0da1515
Add a missing MR.
2017-06-15 10:33:30 +02:00
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
7a9f63f212
Added change to db
2017-06-01 14:30:34 +02:00
4d46470e96
Added target_ip to policy_modules table
2017-06-01 14:24:24 +02:00
efd28c0513
Added Enrique Camargo db changes to mr number 2
2017-06-01 11:28:24 +02:00
2216f7ecb9
Add token to Sql query report items for use historical database - #853
2017-05-31 12:42:43 +02:00
47862600a4
Added los querys to migrate
2017-05-30 15:33:16 +02:00
1e0af6ec26
Added field to db
2017-05-29 11:58:42 +02:00
a4636f3435
Added changes in db
2017-05-29 11:55:04 +02:00
0f9a2cf2f8
New feature: Graphic grouping. added mr
2017-05-23 17:17:40 +02:00
e243067c4b
New feature: Graphic grouping
2017-05-23 17:13:47 +02:00
37757f7ace
Merge branch 'develop' into '596-default_event_filter_by_user'
...
# Conflicts:
# pandora_console/godmode/users/configure_user.php
2017-05-23 09:48:37 +02:00
2e3f6ad700
Added change to mr
2017-05-10 15:21:42 +02:00
de650b9ef2
Added change to mr (enriquecd)
2017-04-25 16:26:45 +02:00
bd5cda07c4
deleted 1.sql
2017-04-25 10:28:46 +02:00
82530c9b59
Added external query to mr
2017-04-20 16:18:37 +02:00
c3ccb00b2a
new file.
2017-04-20 13:36:03 +02:00
29ad608ddb
Added ; to query transaction
2017-04-18 11:41:51 +02:00
97abef62c4
Added db field to mr
2017-04-18 11:39:46 +02:00
bf368a155b
Drop addcol procedure if not exists
2017-04-17 13:25:36 +02:00
4178343313
Added procedure to avoid migrate fail in tbackup
2017-03-30 17:11:49 +02:00
fbsanchez
Alejandro Fraguas
Marcos Alconada
Daniel Barbero Martin
manuel
Luis Calvo
Alejandro Campos
Daniel Rodriguez
Daniel Maya
fermin831
samucarc
Alejandro Gallardo Escobar
artica
vgilc
enriquecd
manuel.montes
Ramon Novoa
Arturo Gonzalez
Alejandro Gallardo Escobar
Enrique Camargo