8af72c1c9d
add Remote CMD
2019-10-09 17:26:06 +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
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
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
de47275735
Fixed mr
2019-08-30 10:34:52 +02:00
63da85798e
Change mr
2019-08-26 16:10:06 +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
f0bfe6910d
WIP agent deployment
2019-07-16 20:56:47 +02:00
3bbd01026e
WIP agent deployment
2019-07-15 19:37:04 +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
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
5ccc16d7d6
Revert 28.sql
2019-06-27 15:04:58 +02:00
225de6b5ea
MR forgotten change
2019-06-26 19:33:42 +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
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
833248991b
Add mr 29
2019-06-07 11:24:00 +02:00
30b8872ab3
fixed mr 28
2019-05-29 17:06:25 +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
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
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
53e9113b7e
UM notifications MR update
...
Former-commit-id: d2aad195cb9bab4e1efa504cb4b4a583f262f0e3
2019-05-14 17:15: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
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
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
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
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
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
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
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
1238f15190
discovery task advanced summary support
...
Former-commit-id: f9be116dbc2d9b07119794374319ea79a3343a81
2019-03-25 17:32:18 +01:00
Daniel Barbero
alejandro-campos
fbsanchez
Luis Calvo
Daniel Maya
Daniel Rodriguez
Marcos Alconada
Alejandro Fraguas
manuel
fermin831