fd12c5a009
DB update, default values for Alert correlation
2019-11-22 11:57:20 +01:00
35abd12499
WIP alert correlations
2019-11-22 11:06:55 +01:00
ab1a64a2e6
Merge remote-tracking branch 'origin/develop' into ent-3837-7848-campo-id_source_event-en-vista-de-eventos-y-poder-filtrar-por-este
2019-11-22 10:56:36 +01:00
de3f8b2a0f
updates
2019-11-22 10:56:30 +01:00
960326b980
Add menu omnishell
2019-11-21 18:21:46 +01:00
362837f856
updated default values for tevent_rule, new tokens for correlated alerts
2019-11-21 17:47:21 +01:00
93c4793025
add id_source_event 33.sql
2019-11-21 17:36:01 +01:00
34cdcdfd6e
Merge branch 'develop' into 'ent-3837-7848-campo-id_source_event-en-vista-de-eventos-y-poder-filtrar-por-este'
...
# Conflicts:
# pandora_console/extras/mr/29.sql
# pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
# pandora_console/include/functions_events.php
2019-11-21 10:13:00 +01:00
e9432aaaa5
Merge remote-tracking branch 'origin/develop' into ent-4769-modulos-ssh-php-perl
...
Conflicts:
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
2019-11-20 15:51:47 +01:00
4d332f2bef
fix duplicated operation in migrate file
2019-11-20 12:43:08 +01:00
446d6c3507
Fix windows commands
2019-11-20 12:35:55 +01:00
79a135b077
Fix errata DESC => COMMENT
2019-11-20 11:36:15 +01:00
33b11af3c1
fix missing line in migrate
2019-11-20 11:26:28 +01:00
43ecba3bbb
operator fields for event_rule
2019-11-20 10:40:52 +01:00
471389a72a
Merge branch 'develop' into 'ent-4769-modulos-ssh-php-perl'
...
Conflicts:
pandora_console/extras/mr/33.sql
2019-11-19 14:11:38 +01:00
1b5dcc3e28
Fixed errors in remote command
2019-11-19 12:35:52 +01:00
070fe32d1e
Merge remote-tracking branch 'origin/develop' into ent-4841-8948-Errores-migrate_pandora-6-a-7
2019-11-18 16:27:12 +01:00
443eb1168c
Merge remote-tracking branch 'origin/ent-EDF' into ent-4610-Alertas-de-logs
2019-11-18 12:48:31 +01:00
9440570548
Merge remote-tracking branch 'origin/ent-4772-omnishell' into ent-EDF
2019-11-15 13:08:09 +01:00
990ad339d3
db schema
2019-11-15 09:45:49 +01:00
f69b86663a
Merge remote-tracking branch 'origin/ent-4226-mejoras-plugin-sap' into ent-EDF
...
Conflicts:
pandora_console/extras/mr/33.sql
pandora_console/godmode/wizards/Wizard.main.php
2019-11-14 21:40:35 +01:00
3c87efe113
Merge remote-tracking branch 'origin/develop' into ent-EDF
...
Conflicts:
pandora_console/extras/mr/33.sql
2019-11-14 17:13:38 +01:00
94d87c2a3c
Avoid welcome window on updates.
2019-11-14 14:14:50 +01:00
c17acefc49
Merge remote-tracking branch 'origin/ent-EDF' into ent-4610-Alertas-de-logs
...
Conflicts:
pandora_console/extras/mr/33.sql
2019-11-14 12:22:11 +01:00
b0920d93af
Merge branch 'ent-4772-omnishell' into ent-EDF
...
Conflicts:
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
2019-11-13 18:15:19 +01:00
b9633933e1
Merge remote-tracking branch 'origin/develop' into ent-4774-welcome-to-pandorafms
...
Conflicts:
pandora_console/extras/mr/33.sql
pandora_console/general/header.php
2019-11-12 14:17:45 +01:00
0213bc675e
add changes bbdd
2019-11-08 11:28:37 +01:00
c68a5b57dd
fixed Change bbdd
2019-11-05 16:04:48 +01:00
f4f618c1da
Merge remote-tracking branch 'origin/ent-EDF' into ent-4769-modulos-ssh-php-perl
2019-11-05 15:40:14 +01:00
276fc82556
Merge branch 'ent-EDF' into ent-4226-mejoras-plugin-sap
...
Conflicts:
pandora_console/extras/mr/33.sql
2019-11-05 15:39:18 +01:00
e5f24ca884
Merge develop
2019-11-05 15:27:06 +01:00
58cbc3c738
Merge remote-tracking branch 'origin/develop' into ent-EDF
...
Conflicts:
pandora_console/extras/mr/33.sql
pandora_console/pandoradb_data.sql
2019-11-05 15:17:09 +01:00
ec3c7ba559
Some remote command examples
2019-11-04 20:36:03 +01:00
115c884cd4
Discovery SAP
2019-10-31 21:13:18 +01:00
7bfa076263
fixed error bbdd
2019-10-30 14:52:10 +01:00
d37410ed8c
fixed error bbdd
2019-10-30 14:43:10 +01:00
b7710a6562
fix remove mr34 to mr33
2019-10-30 08:04:13 +01:00
2bb81a839a
Merge remote-tracking branch 'origin/ent-EDF' into ent-4772-omnishell
...
Conflicts:
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/godmode/menu.php
pandora_console/pandoradb_data.sql
2019-10-29 17:15:19 +01:00
383967f68a
Merge branch 'ent-4769-modulos-ssh-php-perl' into ent-EDF
2019-10-29 16:56:01 +01:00
f3fdcb4de0
MR update
2019-10-29 16:06:34 +01:00
049c3c2476
fix migrate missing content
2019-10-28 13:46:37 +01:00
3056c6741a
changes bbdd mr34
2019-10-28 12:20:55 +01:00
74007ebf70
33 => 34, cleanup
2019-10-28 12:18:56 +01:00
d6681cedd1
33 => 34
2019-10-28 12:18:13 +01:00
f06a55c6bb
continue feedback mail
2019-10-23 19:50:57 +02:00
30caad5a6c
Added column cache_expiration in tlayout_template_data in MR, migrate, and pandoradb.sql - #4810
2019-10-15 16:50:05 +02:00
6bf3772690
remote cmd => remote execution
2019-10-09 19:20:58 +02:00
8af72c1c9d
add Remote CMD
2019-10-09 17:26:06 +02:00
2ee725b204
fixed minor error
2019-09-26 16:43:31 +02:00
96622933fc
added new section in integria setup to configure different options for event responses and alert created tickets
2019-09-26 13:22:10 +02:00
20cebbe988
Merge branch 'develop' into 'ent-4461-Configuracion-integracion-integria'
...
# Conflicts:
# pandora_console/extras/mr/32.sql
2019-09-23 17:16:15 +02:00
9bf2980f01
fix minor bugs in integria integration
2019-09-23 12:48:20 +02:00
6def88472a
Merge branch 'develop' into 'ent-4190-mejoras-para-el-menu-de-gestionar-ha'
...
# Conflicts:
# pandora_console/extras/mr/32.sql
2019-09-19 10:18:15 +02:00
d939bf9e93
Merge branch 'ent-3878-Report-type-summation-not-working-properly-migratesql' into 'develop'
...
Ent 3878 report type summation not working properly migratesql
See merge request artica/pandorafms!2738
2019-09-18 17:54:17 +02:00
4adf584827
Merge branch 'ent-4655-nomenclatura-licencia' into 'develop'
...
Changed caption Expires
See merge request artica/pandorafms!2736
2019-09-18 16:49:55 +02:00
0c72fe718c
Update pandoradb_migrate_6.0_to_7.0.mysql.sql
2019-09-18 16:42:09 +02:00
4628e41f69
Added missing changes to pandora_migratte
2019-09-18 16:39:05 +02:00
be1cde5466
Deleted tests
2019-09-18 15:41:20 +02:00
a4e22d325d
Solved issue
2019-09-18 15:39:33 +02:00
43af2269ee
Fixed default values uncompress data
2019-09-18 11:51:01 +02:00
e409b33c6c
Added changes to treport_content_template to db
2019-09-17 12:32:07 +02:00
e89efea022
Added column 'uncompressed_module' to 'treport_content'
2019-09-16 11:18:01 +02:00
aa6c105841
Update 32.sql missed ';'
2019-09-12 17:47:49 +02:00
ebcce5cad4
Merge branch 'develop' into 'ent-4190-mejoras-para-el-menu-de-gestionar-ha'
...
# Conflicts:
# pandora_console/extras/mr/32.sql
2019-09-12 11:17:44 +02:00
da7811953c
Merge branch 'ent-3918-cambiar-el-tamaño-por-defecto-de-los-elementos-de-icono' into 'develop'
...
Added mr and uncommented code
See merge request artica/pandorafms!2558
2019-09-06 13:38:11 +02:00
148cd5cce6
db updates pandora_db
2019-09-05 10:45:17 +02:00
5c535514e1
Updated MR reference
2019-09-02 15:44:48 +02:00
9868462d43
Merge remote-tracking branch 'origin/develop' into ent-4190-mejoras-para-el-menu-de-gestionar-ha
2019-09-02 09:57:45 +02:00
de47275735
Fixed mr
2019-08-30 10:34:52 +02:00
5ad22620b9
mr power up
2019-08-28 12:49:41 +02:00
63da85798e
Change mr
2019-08-26 16:10:06 +02:00
473b29252c
Merge branch 'develop' into ent-3918-cambiar-el-tamaño-por-defecto-de-los-elementos-de-icono
2019-08-26 16:08:03 +02:00
62ec37cf59
propagate tdatabase updates
2019-08-10 03:18:45 +02:00
adbb48ab87
pandora HA review
2019-08-10 02:13:01 +02:00
12eacc1933
Merge branch 'develop' into 'ent-4388-Nuevos-eventos'
...
# Conflicts:
# pandora_console/extras/mr/31.sql
# pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
2019-08-05 09:26:18 +02:00
7ff5e23792
Merge branch 'ent-4460-Eliminar-antigua-integracion-con-integria' into 'develop'
...
removed all deprecated references to integria from code and db data
See merge request artica/pandorafms!2626
2019-08-02 12:28:03 +02:00
a36a293f19
added changes to pandora migrate and MR
2019-07-31 17:18:52 +02:00
927b1fa37f
removed all deprecated references to integria from code and db data
2019-07-31 16:46:26 +02:00
db25d3b231
Cleared unused table
2019-07-26 21:56:37 +02:00
ce346bd604
agent deployment
2019-07-24 17:38:25 +02:00
62d8c04ab3
Agent deployment v1
2019-07-23 13:01:50 +02:00
8d9c4682c7
WIP Agent repository
2019-07-17 20:37:13 +02:00
17dc0b82ac
Merge remote-tracking branch 'origin/develop' into ent-2441-despliegue-de-agentes-desde-pandora
2019-07-17 17:19:58 +02:00
c97074ea74
Merge branch 'ent-4354-Revision_completa_de_macros_de_reports' into 'develop'
...
fixed macros reports
See merge request artica/pandorafms!2595
2019-07-17 13:49:38 +02:00
f0bfe6910d
WIP agent deployment
2019-07-16 20:56:47 +02:00
3bbd01026e
WIP agent deployment
2019-07-15 19:37:04 +02:00
ab308b7d10
Merge branch 'ent-4167-cambio-recon-task-listado-servidores' into 'develop'
...
Changed link to Discovery task list and added ui_get_full_url function over other links
See merge request artica/pandorafms!2555
2019-07-15 12:36:52 +02:00
ecaba5ebd3
fixed errorsr macros reports
2019-07-12 10:24:46 +02:00
47cc0d9d6e
WIP: Agent deployment center
2019-07-10 23:59:09 +02:00
96fbca35a4
Merge branch 'ent-4194-Revision-de-CSS-alternativos' into 'develop'
...
Created black theme - #4194
See merge request artica/pandorafms!2564
2019-07-10 11:47:21 +02:00
000cdfdcfd
WIP failover
2019-07-04 12:09:08 +02:00
22734a4ea2
WIP failover
2019-07-03 17:51:47 +02:00
209681e4c2
ADD failover option availability_graph
2019-07-02 11:50:58 +02:00
0064bc0cba
fixed errors
2019-07-01 17:07:39 +02:00
9163f725ed
Created black theme - #4194
2019-07-01 16:57:33 +02:00
03842df33e
Added mr and uncommented code
2019-06-28 11:19:13 +02:00
25e5f0914a
Added delete_files entry for recon view deletion
2019-06-27 16:58:48 +02:00
5ccc16d7d6
Revert 28.sql
2019-06-27 15:04:58 +02:00
d956f08011
Minor fixes
2019-06-27 10:39:43 +02:00
225de6b5ea
MR forgotten change
2019-06-26 19:33:42 +02:00
a10cf51b1b
update current package
2019-06-26 15:37:04 +02:00
4754e20784
Merge remote-tracking branch 'origin/develop' into ent-3980-7966-aws-multicuenta-y-mejora-monitorizacion
2019-06-26 09:52:22 +02:00
004eb11048
MR29
2019-06-25 15:24:15 +02:00
a507d28c1f
Update Aws agent names
2019-06-25 10:12:25 +02:00
180948c51c
Import previous aws account
2019-06-24 19:36:50 +02:00
e4f6a95a89
MR29 credential store
2019-06-21 23:05:21 +02:00
fb24d9bf86
Update 29.sql
2019-06-21 12:08:31 +02:00
6682bad19f
first steps credential store
2019-06-21 12:03:25 +02:00
56a7943a06
Update pandoradb_migrate_6.0_to_7.0.mysql.sql
2019-06-21 11:35:56 +02:00
f1110c6d56
Merge branch 'develop' into 'ent-3837-7848-campo-id_source_event-en-vista-de-eventos-y-poder-filtrar-por-este'
...
# Conflicts:
# pandora_console/extras/mr/29.sql
2019-06-21 11:31:01 +02:00
1dc826c9ff
Added field to tevent_filter (id_source_event)
2019-06-21 11:29:51 +02:00
b428797004
delete_file
2019-06-19 10:12:06 +02:00
a40e420de0
Removed , from numer format
2019-06-10 16:59:05 +02:00
58ba42cec1
Changed code for conversión
2019-06-10 14:53:47 +02:00
cf84c3f579
Merge remote-tracking branch 'origin/develop' into ent-3639-bug-mensaje-de-tamano-del-log-de-consola-en-diagnostic-info
2019-06-10 12:43:08 +02:00
833248991b
Add mr 29
2019-06-07 11:24:00 +02:00
23e631f7d8
Added missing create table to migrate 6 to 7
2019-06-04 08:52:25 +02:00
30b8872ab3
fixed mr 28
2019-05-29 17:06:25 +02:00
2e3338b595
Merge branch 'ent-3961-Añadir-caché-para-los-elementos-de-la-Consola-Visual' into 'develop'
...
Ent 3961 añadir caché para los elementos de la consola visual
See merge request artica/pandorafms!2443
2019-05-29 15:48:45 +02:00
702b7e69ba
Merge branch 'ent-4020-cambiar-mensaje-de-bienvenida-tnews-3' into 'develop'
...
Changed query and comment for tnews message
See merge request artica/pandorafms!2465
2019-05-29 12:58:54 +02:00
1f3656c0d3
Changed query and comment for tnews message
2019-05-29 12:09:44 +02:00
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
5966367f8f
eHorus user level login conf added in user editor
2019-05-28 13:14:42 +02:00
3736d84589
Edit ehorus user
2019-05-27 18:49:47 +02:00
588d19102f
Resolve merge conflict
2019-05-27 18:30:24 +02:00
01d96728c8
changed PK to NULL
2019-05-24 11:03:09 +02:00
4c874e152c
Merge
2019-05-23 10:43:32 +02:00
2de2d1f482
Added expiration and deleted old cache data in pandora_db
2019-05-23 10:35:03 +02:00
979f11ca8f
Merge branch 'ent-1668-update-manager' into 'develop'
...
Ent 1668 update manager
See merge request artica/pandorafms!2420
2019-05-22 15:25:49 +02:00
c50eb57499
Merge branch 'ent-4016-error-en-valor-de-diagnostic-info' into 'develop'
...
Added new min value for InnoDB file per table( 0 to 1)
See merge request artica/pandorafms!2416
2019-05-22 12:05:29 +02:00
ada49966e0
Merge branch 'develop' into ent-3468-Ayudas_online
...
Conflicts:
pandora_console/godmode/reporting/reporting_builder.php
2019-05-21 10:05:06 +02:00
5c0a197b6b
Added cache
2019-05-20 15:15:54 +02:00
5e9b2479eb
Merge remote-tracking branch 'origin/develop' into ent-1668-update-manager
2019-05-20 13:11:39 +02:00
c40e0ec702
pandora_console/extras/delete_files/delete_files.txt
...
Former-commit-id: 6931c868b5a5df1e7068c4571902ad112a1333c9
2019-05-16 15:38:51 +02:00
ec60a3193a
removed all group from communications target
...
Former-commit-id: 797a467fed8eff0f9a81c9bbe72780f4e91faa67
2019-05-16 12:52:41 +02:00
034480bf88
minor fixes
...
Former-commit-id: ced1aad7a9835dab5b44817f191e33d2ca11cff3
2019-05-16 12:28:46 +02:00
702926cf85
solved merge conflict mr 28.sql
...
Former-commit-id: 687cf5c37f15648421843b5d2908351fc2f3c032
2019-05-16 10:15:46 +02:00
3bf06f0b72
MR minor updates
...
Former-commit-id: 55105f3858b8ec659c67bf906b09afeb61a1d39c
2019-05-15 00:00:21 +02:00
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
fbsanchez
Daniel Barbero
marcos
alejandro-campos
Tatiana Llorente
Daniel Rodriguez
Alejandro Fraguas
Luis
Jose Gonzalez
Daniel Maya
Rafael Ameijeiras
manuel
fermin831
samucarc
Alejandro Gallardo Escobar
artica
vgilc
enriquecd
manuel.montes