6485de04fd
Auto-updated build strings.
...
Former-commit-id: b5071a47e475e0aa13a62e9e76066cfd10d99ec1
2019-01-30 00:01:26 +01:00
11456bcfbb
Merge branch '2519_Listart_y_crear_comandos_de_alerta' into 'develop'
...
Add commands alert
See merge request artica/pandorafms!2025
Former-commit-id: 340201221d0219a0c67e1e34eb6421b7c6d1782d
2019-01-29 18:26:56 +01:00
3eeaf83ee3
Update pandora_manage.pl
...
Former-commit-id: 4bc758a4284e96658137fb9580f36163a2031944
2019-01-29 17:40:25 +01:00
eb0b9bd05b
Update pandora_manage.pl
...
Former-commit-id: 4064310d63eb101eb1a13825357aa5c425eae502
2019-01-29 17:16:47 +01:00
ae190ef058
Merge branch 'ent-2523-APIListar,-crear,-borrar-y-modificar-Usuarios-desde-la-API-#6167-EUComm' into 'develop'
...
Ent 2523 api listar, crear, borrar y modificar usuarios desde la api #6167 eu comm
See merge request artica/pandorafms!2149
Former-commit-id: a5a1e6aadf4efe43160eebe883a27ce58ac09bc2
2019-01-29 16:23:35 +01:00
c05e99f37e
Update pandora_manage.pl
...
Former-commit-id: 451b04e91078b99c8b9f41a35271797c343f357c
2019-01-29 16:07:39 +01:00
5bc10915da
Merge branch 'ent-3451-retoques-ipam' into 'develop'
...
added pandora_block_ping to check response of multiple addresses
See merge request artica/pandorafms!2147
Former-commit-id: 6adf7e7f59beba0d1f579ab267fd40d0c21a24c4
2019-01-29 15:58:00 +01:00
a3c71f4bca
Merge remote-tracking branch 'origin/2523-APIListar,-crear,-borrar-y-modificar-Usuarios-desde-la-API-#6167-EUComm' into ent-2523-APIListar,-crear,-borrar-y-modificar-Usuarios-desde-la-API-#6167-EUComm
...
Former-commit-id: b8eba6ae5a4efa338199efbc35b50b1b6bea8824
2019-01-29 11:57:19 +01:00
cec6aedaf5
Updated version and build strings.
...
Former-commit-id: 3ba62782db1b3eac4caafb21b5491d249f5a9b44
2019-01-29 11:08:54 +01:00
354834a872
Auto-updated build strings.
...
Former-commit-id: b59b540696e6f36d82e154a9aefea75519e9adac
2019-01-29 00:01:27 +01:00
d0d95cbca5
added pandora_block_ping to check response of multiple addresses
...
Former-commit-id: a2202f029e0fae80f3156a1a10afca0fe18c7ac2
2019-01-28 20:02:58 +01:00
cf2b9c5798
Fixed conflicts
...
Former-commit-id: 1be548acda51690c59d03e7270810ad03bb16822
2019-01-28 15:35:37 +01:00
042bf1c6e7
Merge branch '2526_Listar_acciones_de_alerta_desde_la_API' into 'develop'
...
List alert actions in nodes with CLI and API
See merge request artica/pandorafms!2085
Former-commit-id: 9732161ea417a1518e508cb9e2d20438d34ec3b2
2019-01-28 12:56:28 +01:00
550abc6634
Auto-updated build strings.
...
Former-commit-id: b2b65befe5f01bb047fe48f25c4f33eacc277d41
2019-01-28 00:01:23 +01:00
dd9f6e5f21
Auto-updated build strings.
...
Former-commit-id: 92bbfc8b4c06e1873fe92c9f3b31ddc43d070a1d
2019-01-27 00:01:29 +01:00
50036f2120
Auto-updated build strings.
...
Former-commit-id: 18dc882c6097c97f606ffc45e592f2118b4890cc
2019-01-26 00:01:25 +01:00
61c9603ae8
Merge remote-tracking branch 'origin/develop' into ent-3013-ipam-modo-configuracion-de-vlan
...
Former-commit-id: ec5c28bb52343952fd644c1f999d3b5ef04cd709
2019-01-25 09:55:09 +01:00
d191cdef17
Auto-updated build strings.
...
Former-commit-id: 0c056fa59423bd4342f513f80bd0a49a9df0dddd
2019-01-25 00:01:33 +01:00
f9113fa2e5
Auto-updated build strings.
...
Former-commit-id: 4593b36762b46a3b621d39318cb7a9e5b437db52
2019-01-24 00:01:27 +01:00
25d4239ef9
Merge branch '2521_Crear_grupos_de_modulo_desde_la_API' into 'develop'
...
Create module group API
See merge request artica/pandorafms!2053
Former-commit-id: 55819d89a59549ebec28d32840667e37d34a1f79
2019-01-23 17:02:34 +01:00
841a9cf60b
Merge remote-tracking branch 'origin/develop' into ent-3013-ipam-modo-configuracion-de-vlan
...
Former-commit-id: a23fffb984a6edd4ef7eefe871814ea0120c615a
2019-01-23 11:08:48 +01:00
1e4a288f53
Auto-updated build strings.
...
Former-commit-id: d02bc496b37ddd35ad1a75174daa0b3ca6d24f24
2019-01-23 00:01:23 +01:00
2e2774f256
Merge remote-tracking branch 'origin/develop' into ent-3013-ipam-modo-configuracion-de-vlan
...
Conflicts:
pandora_server/lib/PandoraFMS/DataServer.pm
Former-commit-id: 5729e346de91ebf8897bc5d0dbc9f3f451711e86
2019-01-22 17:42:47 +01:00
f1dbd40a6a
Merge branch 'ent-3421-error-en-un-push' into 'develop'
...
Ent 3421 error en un push
See merge request artica/pandorafms!2138
Former-commit-id: 6740a7f61adebbacaeb40b47b42973e4b518d12d
2019-01-22 10:04:07 +01:00
4236b55694
Merge remote-tracking branch 'origin/develop' into ent-3013-ipam-modo-configuracion-de-vlan
...
Conflicts:
pandora_server/lib/PandoraFMS/DataServer.pm
Former-commit-id: 87b7d3a7591ed181be022b786deba8f090e43d49
2019-01-22 09:00:47 +01:00
c586b68cb3
Auto-updated build strings.
...
Former-commit-id: 84dcfe707e9a70754b4ee72365bd549c8d1c09ef
2019-01-22 00:01:24 +01:00
da7e8e5487
Fixed conflict
...
Former-commit-id: 9ca611335700b59f58edf02fa1ab393fcfb8c567
2019-01-21 19:03:32 +01:00
e540d96eb2
Revert "Added events in DataServer processed XML"
...
This reverts commit cbe518dc53
2019-01-21 18:43:47 +01:00
64b8223f12
Revert "Added matrix_data XML"
...
This reverts commit d970c6628a
2019-01-21 18:43:09 +01:00
75dc82f42f
Merged two branches into one
...
Former-commit-id: 1e15cd80a5ef0a03834c4d835c7ff0fe77b4c7e0
2019-01-21 18:41:46 +01:00
c75f94f9e0
Merge branch 'ent-3418-nueva-estructura-de-datos-tnetworkmatrix' into 'develop'
...
Ent 3418 nueva estructura de datos tnetworkmatrix
See merge request artica/pandorafms!2136
Former-commit-id: b04eaee2ce78625f9710b0851609ca8dfa2aea43
2019-01-21 18:32:05 +01:00
d970c6628a
Added matrix_data XML
...
Former-commit-id: cd26d436e6745a456df95484120d1b96439b274d
2019-01-21 18:27:31 +01:00
f77373aa1d
Plugintools added ip2long & long2ip
...
Former-commit-id: 5c5f9589a32947ce2d9a725e504661a11c8311ee
2019-01-21 18:06:44 +01:00
cbe518dc53
Added events in DataServer processed XML
...
Former-commit-id: e3166d9fb2bcbf1b6aa574ae1a96e796a26a70a6
2019-01-21 15:12:46 +01:00
367c9fc6fc
Merge remote-tracking branch 'origin/2521_Crear_grupos_de_modulos_desde_la_API_2' into 2521_Crear_grupos_de_modulo_desde_la_API
...
Former-commit-id: 7d604cb6777734f43dc5d64f38b5cca651cce25d
2019-01-21 11:41:57 +01:00
dc24599f18
Merge remote-tracking branch 'origin/develop' into ent-3013-ipam-modo-configuracion-de-vlan
...
Former-commit-id: f89cf021526d5e7f9fcaad080d0f8721c20c82cb
2019-01-21 09:22:42 +01:00
e2471b376c
Auto-updated build strings.
...
Former-commit-id: 6c89b359049f06338695df7e9cabd3293885df10
2019-01-21 00:01:23 +01:00
14c5e9d48b
Auto-updated build strings.
...
Former-commit-id: 1eb9179a088600ca4e68930cf9e903997d8f20c7
2019-01-20 00:01:23 +01:00
5a75662b99
Auto-updated build strings.
...
Former-commit-id: 8eff24974e5b3cfbeb57d408c2d4817fe0cb7156
2019-01-19 00:01:25 +01:00
c24bea32a8
ip to long utils moved to Tools
...
Former-commit-id: 737257575dc1ac69ad9f1a284d7165077d7d6d4e
2019-01-18 12:55:49 +01:00
979a87762e
Auto-updated build strings.
...
Former-commit-id: 56c567b92e7aad5a2aabd6551b3aa2f07517fb0b
2019-01-18 00:01:26 +01:00
d57e6db0c0
Merge branch 'ent-3013-ipam-modo-configuracion-de-vlan' of brutus.artica.lan:artica/pandorafms into ent-3013-ipam-modo-configuracion-de-vlan
...
Former-commit-id: e65828cb880c2e11f7e54b61d748bf43d8e0f53b
2019-01-17 18:42:46 +01:00
81a6584d1c
Discovery modules (IPAM: DHCP)
...
Former-commit-id: 1849f6625fbd19dd2d6362d3ea20dc16ac73c29b
2019-01-17 18:42:38 +01:00
d0ded14018
Merge branch 'ent-3328-7200-correcciones-consola-vmware' into 'develop'
...
Ent 3328 7200 correcciones consola vmware
See merge request artica/pandorafms!2126
Former-commit-id: e050791eefa12e7df5348fb190788be539e56c05
2019-01-17 16:29:11 +01:00
6bf6fd19d6
Auto-updated build strings.
...
Former-commit-id: f9fe79ec45febec900d21f62269f4352cc1a97a2
2019-01-17 00:01:26 +01:00
fe13a117aa
Auto-updated build strings.
...
Former-commit-id: 04682af4f07a1cb2bae17db88c4a4f4e17ad5600
2019-01-16 00:01:27 +01:00
2e8e911ca7
added safe_input to custom_fields - value while storing them in db
...
Former-commit-id: e06e141883d87a7247a6426a75c03c7df6045e9b
2019-01-15 18:22:55 +01:00
a84db4d88f
Merge remote-tracking branch 'origin/develop' into ent-3328-7200-correcciones-consola-vmware
...
Former-commit-id: b09a410d415480efd4bcf6c387347e2e582febeb
2019-01-15 18:22:27 +01:00
6ba8b9ab9a
Merge branch '2299_Añadir_nueva_funcionalidad_en_el_CLI_remove_agent_from_policy' into 'develop'
...
2299 añadir nueva funcionalidad en el cli remove agent from policy
See merge request artica/pandorafms!2092
Former-commit-id: d9ef39c8571ab3558e76883e1afc9cbb00225c79
2019-01-15 14:37:08 +01:00
6894623429
Auto-updated build strings.
...
Former-commit-id: 582bbf87e0972212cf48dc220871981f80974321
2019-01-15 00:01:25 +01:00
artica
Alejandro Fraguas
Samuel Carcases
Daniel Rodriguez
samucarc
artica
fbsanchez
daniel
fermin831