db4cfaf1b7
fixed errors reporting_builder.php
...
Former-commit-id: 387262b9ce2735ca60c6a1560c7a55eda9cb5237
2019-05-03 12:11:20 +02:00
9b9d2a3647
fixed errors reporting_builder.item_editor.php
...
Former-commit-id: bef20169ce65e7d78aece4d390bc76f8098864d7
2019-05-03 10:39:29 +02:00
b1dd6edc64
Added changes in helps
...
Former-commit-id: e63717665df7be9e2f00b5492ef77c8e93a4e9a4
2019-04-30 12:28:11 +02:00
7045e59e87
Added changes in helps
...
Former-commit-id: 863eec78c48a3a29b62326dc7ef2609b2990819c
2019-04-30 10:44:53 +02:00
d16b96309b
Fixed pagination in Alert templates
...
Former-commit-id: 88def9abc66ae8fddceb97ec55823b92ddc1bb1f
2019-04-29 14:45:11 +02:00
6bd8221bc0
changed helps
...
Former-commit-id: 3319f3d09d695e2b9f2958f1ac013eb2e0a001b4
2019-04-29 14:36:02 +02:00
da8507c4b4
Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop
...
Former-commit-id: 56da7f09fa90543ae4b07af79da5dd308a4aa395
2019-04-25 16:05:27 +02:00
c1272035cc
Merge remote-tracking branch 'origin/develop' into visual-console-refactor
...
Former-commit-id: 6cffccf44d4bf8c5b87c5c5f112d814c796645c6
2019-04-24 17:05:20 +02:00
e543b64833
Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop
...
Former-commit-id: dcf81c584d7d2dc8ee8def3e8786d7e67f92da46
2019-04-24 16:20:42 +02:00
50e994e065
Merge branch 'ent-bug-conflicto-con-simple-selects-con-atributo-size' into 'develop'
...
change way to print discovery simple multiple inputs
See merge request artica/pandorafms!2378
Former-commit-id: a4de7318635a68d1c9c1343b3674a93581d5ce23
2019-04-24 13:55:02 +02:00
ac41e9255f
helpers
...
Former-commit-id: 56c67397cb17ca0ebc28e2903c378fcda10a6536
2019-04-24 13:53:18 +02:00
759a533180
Merge branch 'ent-3750-carrefour-api-crear-modificar-y-eliminar-perfiles-de-usuarios-metaconsola' into 'develop'
...
Commit para revisar progreso
See merge request artica/pandorafms!2289
Former-commit-id: b8924b2fc0d151274809ab625fa840b27412d493
2019-04-24 13:47:15 +02:00
fc40518e65
minor fix in task description (Discovery.cloud.aws.rds)
...
Former-commit-id: 1c32a684edddc17eef5a4bb5260a148632767efb
2019-04-24 13:29:18 +02:00
8aa1737d23
New style for update manager online Open Version - #3608
...
Former-commit-id: 782a5467c6249e73cbcf5ef1f3185a3edfc6a9d5
2019-04-24 12:45:07 +02:00
7433d52130
change way to print discovery simple multiple inputs
...
Former-commit-id: 845171053b2002d036f0f8992a2aacad4ec0a561
2019-04-24 12:32:33 +02:00
c075d5caad
Added condition type not normal in alert templates
...
Former-commit-id: c2028e4c64e4126768f33f73edb93b39fdf6a79d
2019-04-24 10:51:55 +02:00
f116bfc3fd
Updated discovery task selector
...
Former-commit-id: dc692cd11f2bd81dcb7d4dea57954d77562ef561
2019-04-24 10:10:08 +02:00
194f4400f7
Merge branch 'ent-3647-Revision-estilos-discovery-con-la-nueva-linea-de-estilos' into 'develop'
...
Ent 3647 revision estilos discovery con la nueva linea de estilos
See merge request artica/pandorafms!2370
Former-commit-id: 0f46544f8b05ee464c4dd85301f7a23a4067267a
2019-04-23 17:48:00 +02:00
2bafba0764
Se añade el contenido del fichero borrado
...
Former-commit-id: 9d2e8a9d873bd70549bf4bb1a6a9f7318dc4f36a
2019-04-23 17:40:49 +02:00
1eeba6855e
New style for update manager online - #3608
...
Former-commit-id: 488cdae753c5a7fff6e1c69dce4da9675e4ef425
2019-04-23 13:57:12 +02:00
a79092ded0
New style for update manager online - #3608
...
Former-commit-id: 43222aa59ceb936bf4c16fc73d08bba04f65abd9
2019-04-23 11:41:45 +02:00
ecd63667e5
New style for update manager online - #3608
...
Former-commit-id: 3cb6fb7aae2f73bc60e11cd97e3af0fda1c89354
2019-04-23 11:33:19 +02:00
579c9e7083
New style for update manager online - #3608
...
Former-commit-id: 5c69869fb8c79071589c16d25b5bf314910dc501
2019-04-23 10:12:35 +02:00
4f6a81dc5b
visual changes to discovery
...
Former-commit-id: fd606abb997aa4f3144d072f610915524b5358db
2019-04-22 17:46:04 +02:00
973ce07811
New style for update manager online - #3608
...
Former-commit-id: 377766a3a53d111f3531bff9ea7796cc6d02c143
2019-04-22 16:56:31 +02:00
20058be56a
Fixed visual bug in policies operations actions
...
Former-commit-id: c47606c0c53e74b1ac8610f0be6bd0228e14d42a
2019-04-22 16:37:06 +02:00
2ca68daf9a
New style for update manager online - #3608
...
Former-commit-id: ea7a378d1c4092b3b0540fe2a94ae7415e7a200e
2019-04-22 15:45:57 +02:00
518a9a1eed
New style for update manager online - #3608
...
Former-commit-id: 8fb65c7064238d8f2180db6fedd99058667f804e
2019-04-22 15:41:57 +02:00
f06e81dcc4
Discovery: Minor update in description and extra information in log
...
Former-commit-id: b24c095a8c75d190ba03ea089a9d680fcccd5b2b
2019-04-22 13:49:58 +02:00
19ec5a0733
minor fix
...
Former-commit-id: 34ebb713083bce476e15483e710f23295cf842cb
2019-04-22 13:26:17 +02:00
ca05867e55
Merge remote-tracking branch 'origin/develop' into ent-3674-discovery-fase-3
...
Former-commit-id: 3b243ec4bd93ba4cb494f0ea1a53043cc8e890c6
2019-04-22 13:23:58 +02:00
fa0da4504e
Fixed bug connection ok when db connection returns null
...
Former-commit-id: d2d6ea104bea4a0d0b4ffb2c64818428ee6ad703
2019-04-22 12:00:06 +02:00
e9af2b6a1e
Breadcrum fix do not rollback...
...
Former-commit-id: af2a9520e71da6a3287dc8c462a3dea5c72ba602
2019-04-22 10:45:07 +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
fb87b97cd4
Merge remote-tracking branch 'origin/develop' into ent-3750-carrefour-api-crear-modificar-y-eliminar-perfiles-de-usuarios-metaconsola
...
Former-commit-id: 628100b56c9528995e0f95ef8918dedaba16c8dd
2019-04-17 15:12:56 +02:00
274c78f647
Merge remote-tracking branch 'origin/develop' into ent-3611-Vista-Creación-Edición-de-Agente
...
Conflicts:
pandora_console/include/styles/pandora.css
Former-commit-id: 8beb92aea96f37340434f4a2e5e8012058d52b0a
2019-04-17 10:49:02 +02:00
ed3155c053
New View Create/Update Agent - #3611
...
Former-commit-id: e8c3576ca06561f5979c0151670115b697533843
2019-04-17 10:35:32 +02:00
cfff9c065d
New View Create/Update Agent - #3611
...
Former-commit-id: 5a36e41a05341d5afa19917a99f34ac16cfc99e9
2019-04-17 09:27:15 +02:00
d5b83b867b
Visual Console Refactor: bugfix
...
Former-commit-id: 8ea3faa88a1fd46d4f992e174e7916b91d9e9160
2019-04-16 17:44:39 +02:00
998a66f654
Visual Console Refactor: added a setting to use the legacy VC and added the relation line width setup option to the client
...
Former-commit-id: c6bb6ed82a8e84c485ad7270ebb46150fdfcfa8b
2019-04-16 12:23:03 +02:00
8c27411be6
Delete plugin.php
...
Former-commit-id: c37a85bcf4082a148e72cdc9b1a166a70ec94537
2019-04-15 15:18:22 +02:00
a3787c687c
prueba
...
Former-commit-id: 61d4bc20b7811c44125b806f960561eb40412818
2019-04-15 15:10:43 +02:00
072fec3dd1
removed map link from mysql/oracle/RDS discovery tasks
...
Former-commit-id: c01ca25dbe4ca16265a6377d80f60f6d603b7664
2019-04-15 13:03:11 +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
c33a2cfaf6
Change arrow images to sort the table in custom reports - #3707
...
Former-commit-id: 62613d1c4e41fff93217ddb111c3b8c7ddc08ff4
2019-04-11 10:26:26 +02:00
187bdb1701
New design for the tables - #3707
...
Former-commit-id: 7781a8b392919f38259aed142f01e786fc82698a
2019-04-11 09:57:07 +02:00
834d5d6c50
WIP:Discovery RDS
...
Former-commit-id: d53eb29ec8e7c70c1c76918c1770f65ad81f8ba0
2019-04-10 20:40:03 +02:00
fd7cbf14cd
Merge remote-tracking branch 'origin/develop' into ent-3707-Nuevo-diseño-para-las-tablas
...
Former-commit-id: 91bbd1dac954b151482546b3a75065ab80f19687
2019-04-10 10:15:15 +02:00
30c5f2b243
Merge branch 'ent-3707-Nuevo-diseño-para-las-tablas' of brutus.artica.lan:artica/pandorafms into ent-3707-Nuevo-diseño-para-las-tablas
...
Former-commit-id: 77343765f8b254939406fc320fc64dce86672b6f
2019-04-10 10:09:21 +02:00
2a37224653
New design for the tables - #3707
...
Former-commit-id: 3ff7435a5edbbd736d56df4c7fc02d21209c3d96
2019-04-10 10:06:27 +02:00
e59ce5412c
WIP Discovery RDS
...
Former-commit-id: fba3f7dbd44ca131404aa2d3986d3925b9754382
2019-04-09 18:33:02 +02:00
021fc1dbfd
Fixed bug in unlinked modules
...
Former-commit-id: 08279c7f8605b54ae7ecaba32cc7d3c501b3ad5f
2019-04-09 10:46:37 +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
41ea1a4c66
Fixed minor visual bug - #3707
...
Former-commit-id: 963b3e5385bddb1726d87c57d6ee24c5ad437d1b
2019-04-08 11:31:27 +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
aa640efc44
Merge remote-tracking branch 'origin/develop' into ent-3707-Nuevo-diseño-para-las-tablas
...
Former-commit-id: 43e5f9f044a351f1c6cf1c192b9f92cba6d1b0b3
2019-04-05 13:19:42 +02:00
d91631e0e1
New design for the tables - #3707
...
Former-commit-id: 08bb5008c402afa0d5e75d7f8ade167843a22499
2019-04-05 13:18:38 +02:00
970a10ba50
fixes in non agent per database
...
Former-commit-id: 7b34ea990bf52c96d4d6f65f11cf2949c199f2db
2019-04-05 10:41:37 +02:00
db9068e25a
fixes in non agent per database
...
Former-commit-id: 180cf7269886787b17dc359bf941b5ce5e1b1313
2019-04-05 10:41:09 +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
c679751f94
fixed error add ff_type
...
Former-commit-id: 177e40f655f309eed3e7d877ffb00172b0105095
2019-04-02 16:01:24 +02:00
9fe8dcdda3
Merge remote-tracking branch 'origin/develop' into ent-3707-Nuevo-diseño-para-las-tablas
...
Former-commit-id: db7ea3ebe40521488888cf74b6e6ab6563ab6104
2019-04-02 13:49:51 +02:00
f497d3bd2e
Added class to action buttons and moved checkbox to the left side
...
Former-commit-id: 1d7ba8fa06e734a3e45f7bc1ca2f78d0d8978122
2019-04-02 13:42:30 +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
ee6d8642f3
Merge branch 'ent-3805-nombre-agente-guarda-sin-guion' into 'develop'
...
Fix agent name input to allow '-'
See merge request artica/pandorafms!2319
Former-commit-id: 9496fa004ee36b8d09c875a77cf3f19bec45a130
2019-04-01 18:49:11 +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
343c6a6edf
Fix agent name input to allow '-'
...
Former-commit-id: 8b69d89daa3baeca5126c88c53dbe8323860f95d
2019-04-01 15:18:56 +02:00
b2e16848f9
add new ff type
...
Former-commit-id: b9ff391d6586e5844e78207d44cdf9b80c98ba7e
2019-03-29 14:59:31 +01:00
26451c41a1
New design for the tables - #3707
...
Former-commit-id: 17d66da1d4d0365db38923e15e9c261c12d23544
2019-03-29 11:05:52 +01:00
a3865a3181
flip flop keep counters
...
Former-commit-id: 0d39875c7a78f4be07fdffcf76a686007333c626
2019-03-27 18:16:53 +01:00
34598f391b
Merge remote-tracking branch 'origin/develop' into ent-3707-Nuevo-diseño-para-las-tablas
...
Former-commit-id: 8b576f68f26c1fe2b0d6c1f9029eac599f7a377f
2019-03-27 17:05:50 +01:00
845cb85c55
New design for tables - #3707
...
Former-commit-id: 923414d8bf98d6264e6cebc27706118e16710b70
2019-03-27 17:03:55 +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
08a240746c
breadcrum improvement discovery
...
Former-commit-id: af861b0601e50dbe45ed1cab77ce5ab6f26d3fad
2019-03-26 17:28:31 +01:00
a0f4eb1910
change discovery page title
...
Former-commit-id: 81bf2dc3d489acc1871f6c4cd385fc0f1c1b43aa
2019-03-26 16:10:03 +01:00
0d8322aeda
Merge branch 'ent-3595-discovery-fase-2' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3595-discovery-fase-2
...
Former-commit-id: a9ac8888641116a4e98fbe7ac2d99901e771f275
2019-03-26 15:42:47 +01:00
ec999341ba
change discovery headers and add breadcrumbs to them
...
Former-commit-id: 93183474aabaeccfd3893cacd78c4d6ddf764502
2019-03-26 15:42:33 +01:00
e3b0b7ad11
fixed update progress bars task for 3 second
...
Former-commit-id: 7558c33e8540007608f7afd97ebf03e193a08def
2019-03-26 15:38:47 +01:00
a7ff654826
Removed output in netflow filter
...
Former-commit-id: 4f2cfac6efe1482c86179601bac88826057e7d5c
2019-03-26 11:58:31 +01:00
a2f5b8502a
Merge branch 'develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
...
Conflicts:
pandora_console/include/styles/pandora.css
Former-commit-id: ad45f5bd3f07d6ef7a6d8d6a291d6a2fd75fda78
2019-03-26 10:11:13 +01:00
436e60c736
Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
...
Former-commit-id: 49dc95bbeca973fe13b0c82dc205778294c6066f
2019-03-25 20:14:24 +01:00
448a5e64ea
Fixed disabled custom logo in open version
...
Former-commit-id: 4b5cd56af623bd6485111240be0bb0e11a0a3162
2019-03-25 16:46:17 +01:00
fe7103ba9c
Changes in header
...
Former-commit-id: 3c69b91277f0078a65764c297126d3ebb0dfc11c
2019-03-25 12:41:39 +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
05c03d2d46
NetworkMap class
...
Former-commit-id: 1c5d4f55853928052482f42aca2900d8964929ad
2019-03-20 17:22:06 +01:00
49a28eb13c
Merge branch 'ent-3612_Update_manager_eliminar_archivos_obsoletos' into 'develop'
...
add delete files in update manager
See merge request artica/pandorafms!2263
Former-commit-id: 13d246c80921f2d4b5ceb0b191d0024e8bba753c
2019-03-20 15:51:19 +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
5cdf2dffa7
Merge branch 'develop' into 'ent-3706-No-se-incluyen-parametros-de-autenticacion-y-privacidad-en-wizard-interfaces-para-modulos-satelite'
...
# Conflicts:
# pandora_console/godmode/agentes/agent_wizard.snmp_interfaces_explorer.php
Former-commit-id: f15c507347700205a081d010a9c6f58c0e2e5720
2019-03-19 14:47:32 +01:00
120706248b
fix auth parameters not being included in agent config file when creating module through SNMP interface wizard using SNMP version 3
...
Former-commit-id: 86cfc2f9573ecba48af68ca01c43394cd2c23390
2019-03-19 13:24:06 +01:00
0593e72f3e
move custom net scan and script to OPEN
...
Former-commit-id: ad30ba98670d23ff895b95beb9f58d1105473e3d
2019-03-15 09:11:18 +01:00
8c8f368993
WIP: NetworkMaps rebuild
...
Former-commit-id: d3ca9d0de1b718a35bbc4aae80982b2c4705a454
2019-03-14 18:51:48 +01:00
a1aa480421
add delete files in update manager
...
Former-commit-id: 880dfc8079e7e85fa1fcba4746927caf1a2d2c06
2019-03-14 18:04:28 +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
c2c8287d3e
Fixed resolution in netflow reports
...
Former-commit-id: 9900123e9753f9360085a1dff434bc668df7eb70
2019-03-13 20:15:53 +01:00
3d1f1f86ed
[Netflow live] Removed agregate by none
...
Former-commit-id: 4da1581da67c95f29b9b34eb70436e8f68706988
2019-03-13 19:16:21 +01:00
e0c63e17d7
Merge branch 'ent-3692-No-esta-incluyendo-version-en-wizard-interfaces-para-modulos-satelite' into 'develop'
...
Add module version line to config module configuration data
See merge request artica/pandorafms!2259
Former-commit-id: 5595b821efd2c15e25458cbe8f5d52ab708c533a
2019-03-13 14:05:08 +01:00
ff120b23e2
Merge branch 'ent-3675-Tipo-erroneo-modulos-Ifoperstatus-desde-satelite' into 'develop'
...
Fixed data type to remote_snmp_proc in modules IfOperSttus
See merge request artica/pandorafms!2258
Former-commit-id: 61b2bc62b5605304b2fc278838ed1bf8fc20c395
2019-03-13 13:02:04 +01:00
1276eb3ecf
Add module version line to config module configuration data
...
Former-commit-id: 1a60f3a75f986f65cc8a4e40daf6311ce0148066
2019-03-13 11:57:37 +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
a8af2f89d1
Fixed data type to remote_snmp_proc in modules IfOperSttus
...
Former-commit-id: 40a9c5ec26449c13d01f232504c4e9a02b2e366b
2019-03-12 17:59:52 +01:00
06f8aae91a
WIP NetworkMap class
...
Former-commit-id: 575e0b5d078d01ac82ce313eda57084441fb4301
2019-03-12 16:22:28 +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
c6fa365b90
minor fix force discovery console task
...
Former-commit-id: be2a85079f51fca0222ac25f2f93ad5a14f3542d
2019-03-12 10:47:28 +01:00
1acde54a3f
Merge branch 'develop' into ent-3543-Cambio-visual-de-radio-buttons-y-checkbox-en-el-setup
...
Conflicts:
pandora_console/install.php
Former-commit-id: 89c947d8a835c4a63a8f9a91df5542a3fbc230d9
2019-03-11 09:46:59 +01:00
ccb669a204
Fixed minor errors in setup_ehorus
...
Former-commit-id: ed0ba17641714a87446b4db88d933d7b176e531e
2019-03-11 09:37:08 +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
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
962e519bc9
Merge branch 'ent-3590-Ampliar_limite_de_caracteres_en_str_warning_y_str_critical_en_consola' into 'develop'
...
fixed minor error lenght str.warning and str.critical 1024 charts
See merge request artica/pandorafms!2233
Former-commit-id: d79f8f1b2b293544dd463387d33bd36669accb4c
2019-03-07 15:50:59 +01:00
cfcb427676
fixed minor error
...
Former-commit-id: 5025e19699e773afee950a31bdceeeb0eb4bc47d
2019-03-07 14:52:31 +01:00
00283a5c6a
progress task list
...
Former-commit-id: 5b8a10cdc792e74538784ae27367bc1ca2c7bed0
2019-03-07 14:45:26 +01:00
1020ec1bd7
Merge branch 'develop' into ent-3543-Cambio-visual-de-radio-buttons-y-checkbox-en-el-setup
...
Conflicts:
pandora_console/godmode/setup/setup_visuals.php
Former-commit-id: c193f6995a3a4115270cf45d635e310bf0f8cd3a
2019-03-07 13:45:56 +01:00
d4f5482e99
Added custom field combo values in agent custom field
...
Former-commit-id: 55ca33d3de14c868e1eec3f32179b33dc3ff589b
2019-03-07 13:37:36 +01:00
560c6090a4
deprecated files
...
Former-commit-id: e5c9fb8f58ee78207514d045b478f5d534d86f89
2019-03-07 11:13:44 +01:00
db150470cb
fixed errors in custom net scan
...
Former-commit-id: 15243259cbffa8c639e6412866349357753e1198
2019-03-07 11:09:28 +01:00
a860b293e3
minor fixes in url and descriptions (discovery)
...
Former-commit-id: a53542c61164a41cd4c2befea73191e9f74e5800
2019-03-06 18:28:00 +01:00
d722c39393
add custom net scan
...
Former-commit-id: 61df342754f17b2ecfe3ad06055e9c5b73617d03
2019-03-06 17:14:32 +01:00
9db9d1644c
Eliminated the cache when update agents
...
Former-commit-id: 4e52c0f85ae68a5658c8cd40e72064b48c644934
2019-03-06 11:25:47 +01:00
63ee3b0329
wip: style checks
...
Former-commit-id: 527c939420f9790b7b0850a207dd5221721986fd
2019-03-05 19:02:23 +01:00
70e4e86cdf
Merge remote-tracking branch 'origin/ent-3432-Nueva-cabecera-y-menu-lateral' into ent-3595-discovery-fase-2
...
Former-commit-id: ba98fda78052b11f7bb579cf84d5e29e557e68ac
2019-03-05 18:58:26 +01:00
c03631ec9b
Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
...
Former-commit-id: 1e68380f62f61e9ac895a0c2bade2e6c8f5b589f
2019-03-05 18:56:14 +01:00
09897591c3
Add extended events to event reporting tables
...
Former-commit-id: afbf41109bc382c6b26cb0e6b97d5dc3d580c256
2019-03-05 15:03:05 +01:00
35633d181b
Merge remote-tracking branch 'origin/develop' into ent-3432-Nueva-cabecera-y-menu-lateral
...
Conflicts:
pandora_console/install.php
Former-commit-id: 32eb8fd266b43ce01a297044da9117e8d48b64a6
2019-03-05 13:20:59 +01:00
450eccee7f
ticket resolved, duplicated sentece
...
Former-commit-id: bf419c14b79b633bb2894a34a91f74b32551549e
2019-03-05 13:17:21 +01:00
7be5d3e9e0
new header and menu
...
Former-commit-id: 7a36ca23fc302cf3b86dca26971ce591107b66e8
2019-03-05 12:54:11 +01:00
2ceba76d22
Fixed ldap conf tooltips
...
Former-commit-id: 957a6c1d90ce99630fa2327c829f178561192a50
2019-03-05 09:09:24 +01:00
ab453fde68
WIP: event extended reports
...
Former-commit-id: ad01e92854f766c1a1f35103807b8974c90720a2
2019-03-04 19:06:15 +01:00
488be0d602
Changed radio buttons by checkbox switch
...
Former-commit-id: f0c64cecbf9e1197be08a9a95248d3b4ea8bd949
2019-03-04 13:12:01 +01:00
12a287f322
Merge branch 'develop' of brutus.artica.lan:artica/pandorafms into ent-3432-Nueva-cabecera-y-menu-lateral
...
Conflicts:
pandora_console/godmode/setup/setup_visuals.php
pandora_console/install.php
Former-commit-id: 1c1a318ae74ab3a363a88d99cc079eea6e213171
2019-03-04 09:52:05 +01:00
36fa0fc41f
new header and menu
...
Former-commit-id: d1e8fbd044711f87b75177c32225be7847b60018
2019-03-04 08:39:56 +01:00
41138fbfbb
discovery tasks assimilate cron
...
Former-commit-id: d373a07b50f6ba8ac106dbeee4a84d9a0635464f
2019-03-01 15:26:05 +01:00
3f53541c5e
Added switch to enable NTA
...
Former-commit-id: 5fc3b47f8f9f92ac643db6a5dbe4fc320ca141f6
2019-03-01 13:38:48 +01:00
fadf75a626
fixed minor error lenght str.warning and str.critical 1024 charts
...
Former-commit-id: c7c32a48731eff5c786bd0710652a31a64364861
2019-03-01 13:36:38 +01:00
f0a3f4e9d7
Added configurable purge tnetwork_matrix
...
Former-commit-id: e5869879c2445c15c8332d245ac2dd0d3f8de5d5
2019-03-01 12:39:55 +01:00
a5c3136321
Merge branch 'ent-3621-Discover-vista-de-tasks-bloqueada-y-duplicada' into 'develop'
...
fix discover task view
See merge request artica/pandorafms!2223
Former-commit-id: f8c236623756ef6e76d54cf4ab905f706df1ea84
2019-03-01 12:16:08 +01:00
adb25e91f8
Merge remote-tracking branch 'origin/ent-3621-Discover-vista-de-tasks-bloqueada-y-duplicada' into ent-3595-discovery-fase-2
...
Former-commit-id: 157ed627078c5e6cfedd6ed9d509a339cdb01632
2019-03-01 11:09:11 +01:00
b4170ca285
minor fixes, removed tuser_task_scheduled from tasklist, also cde over ipam references
...
Former-commit-id: 46be3614b9aeb9837748149a805427d68a07f566
2019-03-01 11:08:49 +01:00
d547024274
fixes non-enterprise components
...
Former-commit-id: c22cec27d981c119531a0049469847b9d1a848eb
2019-03-01 09:51:16 +01:00
ed9b736299
Merge remote-tracking branch 'origin/ent-3621-Discover-vista-de-tasks-bloqueada-y-duplicada' into ent-3595-discovery-fase-2
...
Former-commit-id: 9dcad6195eb21f84d90b570828791338ff069ddd
2019-03-01 09:50:09 +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
46089b31a8
Merge branch 'develop' into ent-3594-Unificacion-de-tamaños-de-checkbox-switch
...
Conflicts:
pandora_console/install.php
Former-commit-id: 3dee86da8f6b6b1c2caa5e6e1529acd7f60c1433
2019-02-28 13:36:18 +01:00
52d6dfe815
fix discover task view
...
Former-commit-id: 5475d6be802cd4e7280d12aed6f8f91f7833ed98
2019-02-28 12:00:43 +01:00
75b889ff4a
Merge branch 'ent-3430-proyecto-discovery' into 'develop'
...
Ent 3430 proyecto discovery
See merge request artica/pandorafms!2210
Former-commit-id: 104df0b898d6f4bb9eef21005cca6a3f74c3e035
2019-02-27 10:02:14 +01:00
e18eaaf415
Merge branch 'ent-3287-sincronizacion-plugin-de-servidor' into 'develop'
...
Ent 3287 sincronizacion plugin de servidor
See merge request artica/pandorafms!2199
Former-commit-id: 2153828c0deb35bd72dd6b39612c947b56782c40
2019-02-27 09:58:42 +01:00
de827c12e3
Fixed javascript error
...
Former-commit-id: 581d6f4604ed5b4af7bd68424d2d5769df56c5bf
2019-02-27 09:28:56 +01:00
7ed3252ca5
minor fixes
...
Former-commit-id: 75b33343bed508ff3ff136fa0fedc5d9d8c952be
2019-02-26 20:23:52 +01:00
24a1adfb9f
minor fix
...
Former-commit-id: 6729d11217d0fecb7b64283b6e4d0485b9bdfdc8
2019-02-26 20:08:01 +01:00
a8874f9b1b
Minor fixes
...
Former-commit-id: c3abb9964c61f0535ab59644f6eb1d0a8328212a
2019-02-26 20:00:41 +01:00
5382f07ae2
Comment updates in wizard class
...
Former-commit-id: 9fbb1d0c6499dd1ad71c472970b3993193b581da
2019-02-26 17:42:12 +01:00
5b3ce09515
Comment updates in wizard class
...
Former-commit-id: 0b820729a631d906fe4816ba74f84f700b500c01
2019-02-26 17:41:42 +01:00
2c0c050507
Disabled cache in server plugin synchronization
...
Former-commit-id: c8d60db8aece2db8611ee7d8ac44347f661d9b83
2019-02-26 17:20:23 +01:00
c6ef2ad120
Fixed bug in items reports deleted
...
Former-commit-id: 4781be9487437f8f2e608aaea88e5f9f321ac4d1
2019-02-26 16:51:15 +01:00
36b58d0db8
ticket resolved
...
Former-commit-id: 18e461d26d516a4b58f65ee916e3950b2e85d312
2019-02-26 16:45:54 +01:00
c886dd1dfa
Merge branch 'develop' into ent-3594-Unificacion-de-tamaños-de-checkbox-switch
...
Conflicts:
pandora_console/include/functions_html.php
pandora_console/include/styles/pandora.css
pandora_console/install.php
Former-commit-id: 5cd5899c222ba13ec9bfa0212e5d2ec580353787
2019-02-26 12:31:37 +01:00
45419fbfb0
Fixed href in plugins with centralized node
...
Former-commit-id: 03fa2c15b7a9fb14cdc12499c3bc2a204bae3cd5
2019-02-26 12:23:46 +01:00
875d7ecaba
Unified sizes of the checkbox switch
...
Former-commit-id: f6f8eca748f67fdf1e4a98256c3ca590b61328ac
2019-02-26 12:04:18 +01:00
34eedc5330
new header and menu
...
Former-commit-id: aac70c14548c725b68fa031202e0b8449b725f45
2019-02-26 11:20:17 +01:00
3e87c8e931
new header and menu
...
Former-commit-id: 975b72219cb07e0d4f9b332607e554bd65ea7cc3
2019-02-26 10:43:59 +01:00
c38ac4b837
Updated breadcrum
...
Former-commit-id: 51c14ea50e6c7d419d610ef1b52c4769214495ef
2019-02-26 10:34:37 +01:00
5812a8bdaa
Merge remote-tracking branch 'origin/develop' into ent-3287-Sincronización-plugin-de-servidor
...
Former-commit-id: 93fd236f1876132a18aae31f8ccbcd888a1613f0
2019-02-25 15:43:33 +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
cdca720d9a
minor fix user_edig
...
Former-commit-id: 2e13b75edd5625fa2d1d6d9360d55a19f0992ac0
2019-02-25 14:41:27 +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
4c92375a58
new header and menu
...
Former-commit-id: 3509107664a968fc358a8bb3e662f27b26b10c73
2019-02-25 12:23:15 +01:00
526311d1c6
new header and menu
...
Former-commit-id: 0748bc89d30e8ae4723026848d493d15d82af9cd
2019-02-25 11:54:46 +01:00
be7eadeb2c
extend status change functionality in monitor detail view custom fields
...
Former-commit-id: e48ae88416f50b47aac79ae28b9b4bcd08ebdf73
2019-02-25 11:32:26 +01:00
1f26a8c4b3
Updated message warnings in Tasklist
...
Former-commit-id: beb870813818ff8a7000ffaac7e09f326f0bf253
2019-02-25 11:30:09 +01:00
4da8f54f84
Updated message warnings in Tasklist
...
Former-commit-id: 9f8324e4f882e14451bda7034b1ff081c14a7a41
2019-02-25 11:29:39 +01:00
797f922748
Discovery Tasklist minor fixes
...
Former-commit-id: 693f181168f74f93ad9a3ce628d0defd9ef72d02
2019-02-23 12:13:54 +01:00
8b5f50f883
Discovery minor fixes
...
Former-commit-id: 3914d7a99fb70d88c1a1f95d3c2aeb100f277266
2019-02-22 19:18:07 +01:00
12b8042c53
Added server plugins in meta
...
Former-commit-id: 7f69f55c3fad06c7b15408d755d088d5ac89b111
2019-02-22 14:26:58 +01:00
f0c9d16318
fixed errors view discovery task list
...
Former-commit-id: 7e3160cde5c0fa46ee3d918789ffec4091f42c31
2019-02-22 13:45:59 +01:00
3d2bfa95b5
add table console task in discovery
...
Former-commit-id: b13571167c063188102a8473fb57fa63c18bece3
2019-02-22 12:53:35 +01:00
b1aa0fe2f2
Merge from develop
...
Former-commit-id: 043b38c0e4ea96e0e39cc2480420164dd0f5d3b7
2019-02-22 12:30:27 +01:00
e55915e1e2
Merge branch 'ent-3199-Parsear-espacios-al-final-y-caracteres-especiales-al-introducir-nombre-agente-en-consola' into 'develop'
...
3199-Parsear-espacios-al-final-y-caracteres-especiales-al-introducir-nombre-agente-en-consola into develop
See merge request artica/pandorafms!2193
Former-commit-id: c6e976b78254e6b5b82dddf206c419737bd99a83
2019-02-22 10:01:43 +01:00
45bba4faa8
fix agent name input
...
Former-commit-id: 51b7566719392d1cc43ca04a9ec91ae007e73feb
2019-02-21 19:00:47 +01:00
64679ee72e
discovery minor fixes
...
Former-commit-id: 6d7a1a75bcb6844c839f34a2a2bfaf3f96734db8
2019-02-21 18:00:50 +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
9e9d915609
Modified redirection
...
Former-commit-id: 77dd6fee3a71064e790bd020afbcc91edbdfe20c
2019-02-21 15:35:44 +01:00
36410a26d1
Merge branch 'ent-3436-custom-fields-como-macros-en-el-server' into 'develop'
...
Add support for column macros.
See merge request artica/pandorafms!2182
Former-commit-id: 93dad8f6c54f6e46e5e54dab347a96cffe2fd240
2019-02-21 14:38:21 +01:00
4148387c50
Updates discovery
...
Former-commit-id: e99072a2b7a1ddd528698e12bdfe75b0b56ba25b
2019-02-21 13:05:48 +01:00
ba87d6a9b8
Merge branch 'ent-3214-exact-oid-matches' into 'develop'
...
Add support for exact matches to SNMP alerts.
See merge request artica/pandorafms!2090
Former-commit-id: 5e4c43a5343f7fa6992c05c93c0695b1881548b9
2019-02-21 11:35:51 +01:00
c385a3191f
minor fixes
...
Former-commit-id: ffb62390a5edaa158507f253cf7fb23c690f8fcf
2019-02-21 11:21:56 +01:00
ad3e2b88bf
Minor fixes Wiz.Discovery
...
Former-commit-id: 750cd3ab1902ed3eda9806aa9b505d5e4a1175be
2019-02-21 11:19:38 +01:00
08c6d782a4
Add menuentry discovery
...
Former-commit-id: bc40f0bda89947a88a912484642aa3c89ded64f8
2019-02-20 18:24:32 +01:00
0ed6c6d620
Merge branch 'ent-3430-discovery' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3430-discovery
...
Conflicts:
pandora_console/godmode/wizards/Wizard.main.php
Former-commit-id: 570168ca638ea3403de5768b08c640a909aa27d2
2019-02-20 16:54:52 +01:00
f49b26692e
Fixes on wizards
...
Former-commit-id: 98804bde49e19a7ecb3e2749a8955ac656da54a8
2019-02-20 16:47:29 +01:00
8266c716e8
Merge branch 'ent-3138-ent-Cambiar-alert-por-dialog' into 'develop'
...
Cambiar alert por dialog
See merge request artica/pandorafms!2178
Former-commit-id: b8d1f9f1797ef1d3f54975ca8a695f0a5033938e
2019-02-20 16:37:03 +01:00
300626e551
Merge remote-tracking branch 'origin/develop' into ent-3499-Numero_de_respuestas_de_eventos_masivas
...
Former-commit-id: 4a8482ccef3661c83553dff8f5533c29321f95f2
2019-02-20 15:38:15 +01:00
414ff282e2
Merge remote-tracking branch 'origin/ent-3431-discovery-host-devices' into ent-3394-discovery-applications
...
Former-commit-id: 2d10f49e4eb2078eebd2f6164866fe2a8412d6a3
2019-02-20 14:38:14 +01:00
4834561e87
Wiz. minor fixes
...
Former-commit-id: b3963bf5994a8f9829922e0a1b0be3a20fc54fba
2019-02-20 14:38:00 +01:00
73a5e691ef
Merge remote-tracking branch 'origin/ent-3431-discovery-host-devices' into ent-1798-monitorizacion-aws-amazon
...
Conflicts:
pandora_console/godmode/wizards/Wizard.main.php
Former-commit-id: dead86a654f8b2873721387233a9c9797b0cd8b1
2019-02-20 13:57:54 +01:00
331b09c520
Merge remote-tracking branch 'origin/ent-3431-discovery-host-devices' into ent-3394-discovery-applications
...
Former-commit-id: 7220701d8016a2963cd80cb807bf037af37c2730
2019-02-20 12:32:27 +01:00
f19bdf956e
Wiz. minor fix default value url in goback button
...
Former-commit-id: 434b2acb09290f11c8804024adb8834b86eeda73
2019-02-20 12:32:12 +01:00
Daniel Barbero
manuel
Daniel Maya
marcos.alconada
Alejandro Gallardo Escobar
Daniel Rodriguez
Alejandro Fraguas
fbsanchez
Tatiana Llorente
alejandro-campos
Luis Calvo
fermin831
samucarc