20063 Commits

Author SHA1 Message Date
Daniel Maya
d13e7bbf44 new generic functions
Former-commit-id: 09352ca97ea73505acdb44d14cde79b0d916d286
2019-03-18 09:05:47 +01:00
Daniel Maya
8a7702e054 Update networkmap class with simple map
Former-commit-id: cb6bd489ba973cf0f9c6eda8dee062518f33f382
2019-03-18 09:01:53 +01:00
artica
4772f84850 Auto-updated build strings.
Former-commit-id: d3bb4e970fb058410a3f4889b4706f4a79aef09c
2019-03-18 00:01:24 +01:00
fbsanchez
1ddeda295c WIP networkmap class
Former-commit-id: fbd4ed5e5784c510bc1ea66f1627e61fa176573c
2019-03-17 01:39:56 +01:00
artica
093404eedc Auto-updated build strings.
Former-commit-id: d2bb79b1e176c0047307b57816022ab1834c7da0
2019-03-17 00:01:29 +01:00
artica
16d5bf5f66 Auto-updated build strings.
Former-commit-id: 34092826c1d38aedddf8c660c527ebcec3816c18
2019-03-16 00:01:30 +01:00
fbsanchez
fe045962e7 wip generate_dot
Former-commit-id: f41d5a55ec9cd8f27124d6697e92c5fb3009a2d2
2019-03-15 20:44:57 +01:00
Daniel Rodriguez
eac346daf4 Merge branch 'ent-3598-cambio-en-plugin-dynamic-snmp' into 'develop'
minor updates in plugintools

See merge request artica/pandorafms!2211

Former-commit-id: 30806fc6b073af4607cb4cdf1c3222d930a66d58
2019-03-15 14:07:31 +01:00
Daniel Barbero
d5108efb0d fixed error update manager delete files
Former-commit-id: 88b915f9278eba5949c867ae514a104ce796aec1
2019-03-15 12:19:02 +01:00
Daniel Barbero
916d11c625 Merge remote-tracking branch 'origin/develop' into ent-3612_Update_manager_eliminar_archivos_obsoletos
Former-commit-id: 70641758194522782cc1041f51a278350a7877f1
2019-03-15 10:39:23 +01:00
Daniel Barbero
7e345035e1 add height and round border in d3 graph progress
Former-commit-id: 8eacfe068c1ae744fd04a752f65ed44f747d6158
2019-03-15 10:22:55 +01:00
Daniel Barbero
0593e72f3e move custom net scan and script to OPEN
Former-commit-id: ad30ba98670d23ff895b95beb9f58d1105473e3d
2019-03-15 09:11:18 +01:00
artica
be08d76e6c Auto-updated build strings.
Former-commit-id: b661529d620964e946ecb4973030f2518f332458
2019-03-15 00:01:22 +01:00
fbsanchez
8c8f368993 WIP: NetworkMaps rebuild
Former-commit-id: d3ca9d0de1b718a35bbc4aae80982b2c4705a454
2019-03-14 18:51:48 +01:00
Daniel Barbero Martin
a1aa480421 add delete files in update manager
Former-commit-id: 880dfc8079e7e85fa1fcba4746927caf1a2d2c06
2019-03-14 18:04:28 +01:00
fbsanchez
99b1aadacb discovery icon set
Former-commit-id: d88ba9c57d7a4c590e7a6965b2a4a9f7fd473790
2019-03-14 17:21:16 +01:00
artica
0ccbb1198a Auto-updated build strings.
Former-commit-id: 9f80809f181718d9c5fe97439b4d23c856bf9c93
2019-03-14 00:01:25 +01:00
fbsanchez
f4290e52fe Minor fix notif. ball margins
Former-commit-id: 36705558ac7b2ef94115068acb0bce01662b8ecc
2019-03-13 15:55:24 +01:00
Daniel Rodriguez
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
Daniel Rodriguez
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
fbsanchez
f5b0e6b1a4 minor fix radial redirection
Former-commit-id: 0676ff2eb51a7ea281eb1410b1e5c4082c39d074
2019-03-13 12:55:24 +01:00
alejandro-campos
1276eb3ecf Add module version line to config module configuration data
Former-commit-id: 1a60f3a75f986f65cc8a4e40daf6311ce0148066
2019-03-13 11:57:37 +01:00
fbsanchez
95c61024f7 Cleanup Networkmaps
Former-commit-id: 68893c73092e80bf4a67a0aa82c51ec242aab01f
2019-03-13 11:38:03 +01:00
Daniel Rodriguez
046a126889 Merge branch 'ent-3696-7723-No-inserta-comentario-create_event-API' into 'develop'
disable cache for events_comment

See merge request artica/pandorafms!2257

Former-commit-id: 1293d55a9bc009b79e37dd54cd848544ae6c3286
2019-03-13 10:32:56 +01:00
fbsanchez
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
artica
99afea22cb Auto-updated build strings.
Former-commit-id: 9d92b8845f144366f2d7ed521fefbea0ce7e8eac
2019-03-13 00:01:24 +01:00
fbsanchez
e61d409acc fix in redirection after map creation
Former-commit-id: dbe1a326942df79f77d8973e8a83781778fa59b0
2019-03-12 19:23:40 +01:00
fbsanchez
bf9b84f266 discarded ranksep var as recommended edge len
Former-commit-id: 24fe2b0f7ff49b9bdf4e4ef6463ddf5f66de04d8
2019-03-12 18:38:58 +01:00
fbsanchez
663c1e0841 NetworkMap class rc1
Former-commit-id: 871da4e80cd5909f6bb1da567e3fbe55709690a5
2019-03-12 18:32:55 +01:00
fbsanchez
1bc326c00c WIP: NetworkMap class
Former-commit-id: 888621c19262397298ac934e26e55a0b0ab218ec
2019-03-12 18:17:18 +01:00
samucarc
a8af2f89d1 Fixed data type to remote_snmp_proc in modules IfOperSttus
Former-commit-id: 40a9c5ec26449c13d01f232504c4e9a02b2e366b
2019-03-12 17:59:52 +01:00
Alejandro Fraguas
cb1fc5dc67 Merge branch 'ent-3616-Pantalla-de-login' into 'develop'
Ent 3616 pantalla de login

See merge request artica/pandorafms!2248

Former-commit-id: c6e02af2b50a12933ec31cd5496fafb10a646c7a
2019-03-12 17:23:04 +01:00
fbsanchez
c91c79a735 WIP experiments with graphviz
Former-commit-id: cee005851cd7ed05aa43fd3037c5c7d743d06fa7
2019-03-12 16:52:42 +01:00
fbsanchez
06f8aae91a WIP NetworkMap class
Former-commit-id: 575e0b5d078d01ac82ce313eda57084441fb4301
2019-03-12 16:22:28 +01:00
Daniel Maya
96d6e12546 disable cache for events_comment
Former-commit-id: 4a3477e1911d7d5cc02ac5207ccc30cb43e7f220
2019-03-12 16:12:58 +01:00
Daniel Rodriguez
d314062623 Merge branch 'ent-2674-Nueva_macro_event_timestamp' into 'develop'
Ent 2674 nueva macro event timestamp

See merge request artica/pandorafms!2244

Former-commit-id: 9414e607f69637c19a5d8e61e80a2d43abb9ce0b
2019-03-12 13:51:47 +01:00
Alejandro Fraguas
dbf0229ce0 Merge branch 'ent-3084-Warnings_en_PHP_7' into 'develop'
fixed warnings php

See merge request artica/pandorafms!2197

Former-commit-id: 486796c729a540e5ce75de80914a94dc3c1170ca
2019-03-12 13:24:48 +01:00
Daniel Rodriguez
e55d7f0042 Merge branch '3547-7561-al-pinchar-en-un-icono-enlazado-a-un-monitor-no-aparece-en-la-busqueda-por-defecto-hasta-que-no-le-damos-a-buscar' into 'develop'
3547 7561 al pinchar en un icono enlazado a un monitor no aparece en la busqueda por defecto hasta que no le damos a buscar

See merge request artica/pandorafms!2192

Former-commit-id: 38c35e89b2af8f4c72b912afcbd77f4d08a3951d
2019-03-12 13:18:10 +01:00
daniel
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
marcos.alconada
5227390c87 se elimina linea de autosearch = false
Former-commit-id: aab03c4e38d41b098a8af818b45036f6524580de
2019-03-12 13:06:27 +01:00
fbsanchez
d7983bec4e WIP NetworkMap class
Former-commit-id: ae987e5f6f3ec0997746093d20f7dbd5758c9ff1
2019-03-12 12:05:54 +01:00
Alejandro Fraguas
60337b0da7 Merge branch 'ent-3559-Poner-evento-en-in-progress-provoca-un-fallo-de-visualizacion' into 'develop'
Fixed error in event filters when is only new events

See merge request artica/pandorafms!2252

Former-commit-id: 3dd94c18cf9c3896d7a1f95546c879de63c86fe8
2019-03-12 11:18:51 +01:00
Tatiana Llorente
29f00dd1da New login page
Former-commit-id: ae1cc9368536c6a9fbcea12ec2aa1d6b7584268a
2019-03-12 11:09:12 +01:00
fbsanchez
c6fa365b90 minor fix force discovery console task
Former-commit-id: be2a85079f51fca0222ac25f2f93ad5a14f3542d
2019-03-12 10:47:28 +01:00
fbsanchez
e5190a91ee WIP NetworkMap class
Former-commit-id: 90763db5291c638e89216da48e1fc4fdba92bc82
2019-03-12 10:29:35 +01:00
fbsanchez
0ad8a0383f WIP NetworkMap class
Former-commit-id: f2594c8388e4cb235e39f08945ad064e999cfbcb
2019-03-12 10:29:19 +01:00
artica
67080c72d9 Auto-updated build strings.
Former-commit-id: d5c1d195e9648fa5b091c533b57a6e234275787c
2019-03-12 00:01:23 +01:00
fbsanchez
1d660d259f WIP NetworkMap class
Former-commit-id: 6694ee84fe5e9dc783010a3092753b4041370993
2019-03-11 20:10:08 +01:00
fbsanchez
e672456998 fixes satellite contact interval detector
Former-commit-id: b3536e29fd7ae1330667eee7bf98a55ef3f65e4b
2019-03-11 18:04:23 +01:00
samucarc
5b3dd6121b Fixed error in event filters when is only new events
Former-commit-id: a1e0529b58e4a1c62c8c35cba7b133c218f59a93
2019-03-11 17:14:26 +01:00