39a60639fb
Merge branch 'ent-3439-Añadir-la-macro-de-id-del-trap-a-las-macros-de-alerta-de-trap-snmp' into 'develop'
...
Add _id_trap_ macro to snmp alert macros - #3439
See merge request artica/pandorafms!2177
Former-commit-id: 863b66aead27483654b8ec9eb21efd540f1a22e4
2019-02-19 12:33:43 +01:00
d116e4742a
add new tocken max events responses
...
Former-commit-id: f65e6a478812a913d25fa7b87e9ac2b26b9a5ff4
2019-02-19 12:14:42 +01:00
d554dcc7db
Added the _current_user_ macro to the event responses
...
Former-commit-id: 1a5860bc7a62efecba44d467df9eb9cf7e25070b
2019-02-19 11:37:44 +01:00
8c09b945c7
minor fix changed customer check
...
Former-commit-id: f2659c9e7780dcddaa9528b1aa13a4d61026c154
2019-02-19 11:14:48 +01:00
85371424ee
Minor fixes and status check
...
Former-commit-id: 47a7e75579927c0ac109f303b77ebcc273334581
2019-02-19 11:13:07 +01:00
c9cc744e07
Merge remote-tracking branch 'origin/ent-3431-discovery-host-devices' into ent-1798-monitorizacion-aws-amazon
...
Former-commit-id: d609bc3171cb75d89b641f6dd100e593ae5d1ebd
2019-02-19 11:01:11 +01:00
906ba091e1
minor fixes/changes DiscoveryServer
...
Former-commit-id: 8273727109628f99fc86c125c9b6f62a416c07f1
2019-02-19 10:37:09 +01:00
b8fe20e373
Merge branch '3193-Mal-unidades-de-tamaño-de-log-en-diagnostic-info' into 'develop'
...
Fixed bug in diagnostic info
See merge request artica/pandorafms!2076
Former-commit-id: 79147da886f68dc106ba946a06bad66a6fd00d59
2019-02-19 10:28:31 +01:00
8ac1642dea
Merge branch 'ent-3431-discovery-host-devices' of brutus.artica.lan:artica/pandorafms into ent-3431-discovery-host-devices
...
Former-commit-id: 7b45b6f2d34e1592b9898dc94c826d138e2b6e63
2019-02-19 08:59:41 +01:00
938408ada9
Added wizard
...
Former-commit-id: d47389f000b9295c21d9a56ed0138913d0045b76
2019-02-19 08:58:30 +01:00
2b3a72e938
Auto-updated build strings.
...
Former-commit-id: cf3f4af9caa5c9c435adf672e8c620b4b173f3cc
2019-02-19 00:01:28 +01:00
7f0b676e0f
Discovery tasks. Extended events. Autoconfigure detected agents.
...
Former-commit-id: da2282082606c970dbace453193eb0a7e4089731
2019-02-18 19:50:13 +01:00
af110f4820
minor fix notification direct assignment
...
Former-commit-id: 59ffb2338377ac2c3270681e6905f5d853add16b
2019-02-18 18:13:22 +01:00
9f6a96675e
Merge branch 'develop' into ent-3138-ent-Cambiar-alert-por-dialog
...
Former-commit-id: 5928dfed7bff1870450b7fe9f652d92973b21591
2019-02-18 17:34:24 +01:00
4473762393
Merge branch '3227-No-se-guarda-muestra-correctamente-certificado-ssl-en-setup-general' into 'develop'
...
fix bug when updating path of ssl certificate in general setup
See merge request artica/pandorafms!2052
Former-commit-id: 453119a3a14e50ce6834eb1ee46da2f1289d6082
2019-02-18 17:18:46 +01:00
bb83f4ba4a
avoid to show notification if disabled by user
...
Former-commit-id: d00b09c9e608c51223f7192ad85408976fac5baa
2019-02-18 17:08:23 +01:00
b02aa78060
Merge branch '3404-Mejoras_y_arreglos_en_la_instalación_de_la_consola' into 'develop'
...
fixed error php7 info install and RPM
See merge request artica/pandorafms!2157
Former-commit-id: 5800dae53a03cc5be2c4ab301b93e87f77cc7363
2019-02-18 17:08:07 +01:00
28e5ff0bc2
Added new parameter in pandora_add_policy_queue
...
Former-commit-id: 0a257538c31f86c572d6bfa4fb480035e302364f
2019-02-18 16:58:04 +01:00
5411b83ceb
Merge remote-tracking branch 'origin/develop' into 3404-Mejoras_y_arreglos_en_la_instalación_de_la_consola
...
Conflicts:
pandora_console/install.php
Former-commit-id: 9d1616cab554029cb90f7c0e89276124589e2867
2019-02-18 16:55:09 +01:00
3856059c98
Merge remote-tracking branch 'origin/develop' into 339-No_cortar_elementos_en_PDF
...
Former-commit-id: 9831b389fd955e7351f9f9e07530ff060dad0e49
2019-02-18 16:38:15 +01:00
43ddd9d482
fixed pdf
...
Former-commit-id: e220052501d8f1b4c3d8f392cc9665876671e7ae
2019-02-18 16:34:48 +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
37f6da9aa8
recovered. changes from 0b72571c7c [formerly f3a8cdd6923834443ed7223d1e6ad7776b861184]
...
Former-commit-id: 591e002043d2bae2382c8a91c437057fd2b809c7
2019-02-18 15:36:51 +01:00
27602d8e49
Recovered notification editor for user
...
Former-commit-id: a4fbf05912c974ab388cde9e9237022f2bcc3277
2019-02-18 15:14:24 +01:00
cb94692491
Added function addBreadcrum in Wizard main
...
Former-commit-id: ac40c2fd49ff02a84dc6752c4ea99309a3d4440f
2019-02-18 14:30:03 +01:00
7b2e0342c1
Fix. notification did not reach ALL target
...
Former-commit-id: 237e5dac34bcbe50453e0b56f0964a9d74aa7c04
2019-02-18 14:18:58 +01:00
34cf0bd837
minor fix acl check in notifications
...
Former-commit-id: 3ee0004f0c8ab507ed2301b77117ca945fb4e826
2019-02-18 14:01:17 +01:00
46af41a2cc
support for autoconfiguration
...
Former-commit-id: 034ed513ed9cf7efbe22720b61e8ff431ebbbc84
2019-02-18 14:00:55 +01:00
5816320eff
new token. autoconfiguration_enabled. discovery tasks
...
Former-commit-id: d19c86696b73335b6977d11d5ea683131780097e
2019-02-18 14:00:38 +01:00
e5eb91e62a
Merge branch '3154-Agent-name-en-vistas-de-alertas-de-consola-movil' into 'develop'
...
agent named replaced by agent alias in mobile console's alerts view
See merge request artica/pandorafms!2066
Former-commit-id: 527b887ac9e21faafc27e111a189e3e40056b3a3
2019-02-18 13:42:03 +01:00
e00ae31862
Merge remote-tracking branch 'origin/develop' into 339-No_cortar_elementos_en_PDF
...
Conflicts:
pandora_console/install.php
Former-commit-id: e10a178c783187df7d07027f11b4fa1c06f923b0
2019-02-18 13:16:43 +01:00
efd65edefa
fixed errors
...
Former-commit-id: dc70e23da17691f3af6602cd85e2f01b27d27d58
2019-02-18 13:13:17 +01:00
59cd0a43ea
Merge branch '2536-Error-login-hash-al-editar-una-custom-graph-desde-la-meta' into 'develop'
...
ent-2536-Error-login-hash-al-editar-una-custom-graph-desde-la-meta
See merge request artica/pandorafms!2111
Former-commit-id: b9770bc97e741d6e6d7b0ab111c195ac3fe440df
2019-02-18 12:16:55 +01:00
01b8649812
Merge branch '1744-Opción-para-validar-que-la-ip-de-un-agente-sea-unica' into 'develop'
...
Added option in setup for unique main IP in agents - #1744
Closes pandora_enterprise#1744
See merge request artica/pandorafms!2114
Former-commit-id: 77e1bbae9a1a60bc51739d98948ca8af5d183f78
2019-02-18 12:16:20 +01:00
a1a429aa52
H&D minor fixes and acl checks
...
Former-commit-id: cec9ec899e648ab6e76716333c8ee09ca875023a
2019-02-18 12:14:03 +01:00
29206eb3bb
Added visual changes
...
Former-commit-id: 33ac4873763e6b0e2cf3d2ad2b25492fe5b33583
2019-02-18 11:42:55 +01:00
c897d65f10
Merge branch 'ent-3426-No-desaparece-la-alerta-de-PhantomJS-en-windows' into 'develop'
...
Fixed error with slashes - #3426
See merge request artica/pandorafms!2143
Former-commit-id: 6e78bc1fdb4de94c31c06ff98b9f2f27f2788646
2019-02-18 10:43:16 +01:00
a6bbd17423
Merge branch 'ent-3431-discovery-host-devices' into ent-1798-monitorizacion-aws-amazon
...
Former-commit-id: 11a9f65a87b0b479791aa76e4936cebfb5ab7424
2019-02-18 10:24:35 +01:00
a9caebbbf4
Put the list into a function
...
Former-commit-id: 11e4d0faa3512e46582530f48bab2cfa1031e89f
2019-02-18 10:24:19 +01:00
4017539728
Merge remote-tracking branch 'origin/develop' into 1744-Opción-para-validar-que-la-ip-de-un-agente-sea-unica
...
Conflicts:
pandora_console/install.php
Former-commit-id: 25f781cc2a2be2258e2ad601353afd9f80561a7c
2019-02-18 09:27:40 +01:00
582b8a70da
Merge remote-tracking branch 'origin/develop' into ent-3426-No-desaparece-la-alerta-de-PhantomJS-en-windows
...
Conflicts:
pandora_console/install.php
Former-commit-id: 0c97025f2425b1048efd1447a56ea9e2062b3b13
2019-02-18 09:22:48 +01:00
2332001884
Merge branch 'ent-3431-discovery-host-devices' into ent-1798-monitorizacion-aws-amazon
...
Conflicts:
pandora_console/godmode/servers/discovery.php
Former-commit-id: 4e840a1738523e2e0570413e8e7dedb02b265919
2019-02-18 08:50:54 +01:00
0ef118f401
Auto-updated build strings.
...
Former-commit-id: 2e217d82f2119ffdca6218a233fa8eeb743c3fb0
2019-02-18 00:01:24 +01:00
1fafda8502
Auto-updated build strings.
...
Former-commit-id: affb7e6fc134d1ae80be0450f759a30960b177fd
2019-02-17 00:01:24 +01:00
0d93ccc094
Auto-updated build strings.
...
Former-commit-id: 8789c127ad23a066317bd86d0bfe456dd4a3ec38
2019-02-16 00:01:31 +01:00
c49c8bc0b5
discovery minor style changes
...
Former-commit-id: ea572c9d797214cbfc6f1b9ff2025f0c4819b4ed
2019-02-15 18:44:59 +01:00
912f0baace
Discovery Tasks first tasks and some minor fixes
...
Former-commit-id: 4a37dc99f1b1a95217e9be207526d750133a14a6
2019-02-15 18:42:44 +01:00
a5ad61f340
discovery delete task
...
Former-commit-id: 8809067053aa6bebfa61498afb2108aea352f3d7
2019-02-15 18:35:35 +01:00
5093094d7d
H&D tasklist and some visual changes
...
Former-commit-id: d9130ec520b0c23a9cf42ce62aae6c3d2432649b
2019-02-15 18:05:59 +01:00
0f375d6a76
H&D minor fix group cannot be All
...
Former-commit-id: 2feb42ce06bd379bbb3804a30fab744a4b01b1e1
2019-02-15 16:37:48 +01:00
Alejandro Fraguas
daniel
Alejandro Gallardo Escobar
fbsanchez
fermin831
Daniel Rodriguez
manuel
artica
Daniel Maya
Tatiana Llorente