a63e497497
Wiz. Added textarea input
...
Former-commit-id: 319ab37377e6649c1cd6c6adea1e956e934f2e23
2019-02-20 11:11:26 +01:00
33ed8a2cc1
Merge branch '3219-Vista-de-custom-fields-diferente-nodo-meta2' into 'develop'
...
Fixed bug in metaconsole custom fields2
See merge request artica/pandorafms!2070
Former-commit-id: cb36006bed0259c9e7c70c420d5e46129d64457a
2019-02-20 11:00:42 +01:00
55486e7b93
Merge branch 'ent-2836-Operaciones-masivas-filtrado-de-modulos-por-tag' into 'develop'
...
Fixed bug in filtered modules by tag
See merge request artica/pandorafms!2181
Former-commit-id: f313f0cab032ccc8329933a641db8c541b682474
2019-02-20 10:33:28 +01:00
ca243c46fb
Minor fix
...
Former-commit-id: f3c550c07a38df24b5de84200190583437586720
2019-02-20 08:52:29 +01:00
53a41a7a56
Auto-updated build strings.
...
Former-commit-id: f44eb5d91d85be5ebfaf5fe25cea0fdb40b874f3
2019-02-20 00:01:26 +01:00
69abba260a
Merge remote-tracking branch 'origin/ent-3431-discovery-host-devices' into ent-3394-discovery-applications
...
Former-commit-id: eec0a9614d1dee466d5adb59c9f39d2599360e27
2019-02-19 20:27:34 +01:00
fa3f548cdd
Several changes for Wiz.App support
...
Former-commit-id: 7c86d2e601771686a69d3f1b846638a427a25d6e
2019-02-19 20:27:05 +01:00
55af128cd5
Modified snmp browser to work with wizard
...
Former-commit-id: c8d37e06967ed43867320ae89fd3dc2bede7b0ce
2019-02-19 20:14:14 +01:00
df88582982
fixed error filemanager
...
Former-commit-id: 4bd54ef9c60396822a1a757bc91218b4d2244efa
2019-02-19 17:52:25 +01:00
218e90a663
Merge branch '2970_No_capta_bien_las_fuentes' into 'develop'
...
Fixed minor bug in pandora flot js
See merge request artica/pandorafms!1897
Former-commit-id: 7c45783033b5f856375498ec30954341a4ddc0fa
2019-02-19 17:51:19 +01:00
07db5ce37d
Merge remote-tracking branch 'origin/ent-3431-discovery-host-devices' into ent-3394-discovery-applications
...
Former-commit-id: 9ca0cec89fa7ee8dc9747ab414d95d8afd49877b
2019-02-19 17:15:14 +01:00
ea70c0846c
Added href in wizard
...
Former-commit-id: 9b6b9e66d14257163f14bc904d5b13c6de9f9912
2019-02-19 16:34:11 +01:00
04c4162419
Merge branch '339-No_cortar_elementos_en_PDF' into 'develop'
...
339 no cortar elementos en pdf
See merge request artica/pandorafms!2163
Former-commit-id: 756360a1b91e5edf2c1af80e601085f7b41b505c
2019-02-19 15:39:03 +01:00
2573e40538
Bugfix
...
Former-commit-id: 0ea7cf8437935c77098b1e408a723ac3de4d973c
2019-02-19 14:52:14 +01:00
68afc9289d
Documentation improvements
...
Former-commit-id: ad2155056dd26014f169e277eec2ac7cd463ea3a
2019-02-19 14:51:40 +01:00
1b82a970b1
WIP: App wiz
...
Former-commit-id: aa969dc2fead693977959374c747f046676c5fed
2019-02-19 14:36:16 +01:00
00cba4cbc9
Fixed bug in filtered modules by tag
...
Former-commit-id: 098d3c88a9a30fb1c38074e741f093ff40fd5d02
2019-02-19 13:05:31 +01:00
7bd5851667
Add support for column macros.
...
Former-commit-id: 8b826854c288754feefdbe270701655c6bbbfac9
2019-02-19 13:04:57 +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
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
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
43ddd9d482
fixed pdf
...
Former-commit-id: e220052501d8f1b4c3d8f392cc9665876671e7ae
2019-02-18 16:34:48 +01:00
37f6da9aa8
recovered. changes from 0b72571c7c [formerly f3a8cdd6923834443ed7223d1e6ad7776b861184]
...
Former-commit-id: 591e002043d2bae2382c8a91c437057fd2b809c7
2019-02-18 15:36:51 +01:00
7b2e0342c1
Fix. notification did not reach ALL target
...
Former-commit-id: 237e5dac34bcbe50453e0b56f0964a9d74aa7c04
2019-02-18 14:18:58 +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
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
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
5093094d7d
H&D tasklist and some visual changes
...
Former-commit-id: d9130ec520b0c23a9cf42ce62aae6c3d2432649b
2019-02-15 18:05:59 +01:00
46de260573
Merge branch 'develop' into 2536-Error-login-hash-al-editar-una-custom-graph-desde-la-meta
...
Former-commit-id: 36cdf03e3debabc0a079f08a457c8d2c0ac1c165
2019-02-15 15:55:31 +01:00
2c97708373
Merge branch 'develop' into 3227-No-se-guarda-muestra-correctamente-certificado-ssl-en-setup-general
...
Former-commit-id: d6becbfc3aba9d5197b748647db5e93e3b58c348
2019-02-15 14:56:20 +01:00
087978aa70
fixed errors in reports
...
Former-commit-id: de2cb22c4545dd5ae859f7059e5c8ba13a195723
2019-02-15 14:36:58 +01:00
e04a61df98
Merge branch 'ent-3431-discovery-host-devices' of brutus.artica.lan:artica/pandorafms into ent-3431-discovery-host-devices
...
Former-commit-id: 1744720e44aea863fb01c328cb2d25382d2c40a8
2019-02-15 14:03:29 +01:00
e397353f71
minor fix get_parameter_switch
...
Former-commit-id: c8e430e1cbd789a99058217e7dffb4098aab821a
2019-02-15 14:03:16 +01:00
32d34cd09b
Changed styles in host and devices
...
Former-commit-id: 743f203466e8e3745a33837054e5bc4faa69337c
2019-02-15 14:02:32 +01:00
196de9ae3d
Merge branch 'develop' into 3373-Añadir-opcion-a-mas-parametros-en-api_get_groups
...
Former-commit-id: b8436e3dcbc1b23de21653fcbaff88c544c79562
2019-02-15 13:54:28 +01:00
6c9ce7e65b
Merge remote-tracking branch 'origin/develop' into 1744-Opción-para-validar-que-la-ip-de-un-agente-sea-unica
...
Conflicts:
pandora_console/godmode/setup/setup_general.php
pandora_console/include/styles/pandora.css
pandora_console/install.php
Former-commit-id: b94f977a4d39f2e9e59b7ed9626115b0a458c5dd
2019-02-15 13:18:10 +01:00
efdc17b801
WIP: H&D
...
Former-commit-id: 605aa350c6d8d9bcebadbb941bba2a6fc399cb7c
2019-02-15 13:08:44 +01:00
a20d7b9ce1
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: ef2b7fb631fab61bcb5e21b0632f02a3af451045
2019-02-15 12:10:49 +01:00
f777c59a83
WIP: H&D skel files css wiz&discov
...
Former-commit-id: e57758a9e77b19868262557d9e11a0ff7b38f02c
2019-02-15 10:00:23 +01:00
ffe8bba3f7
added exception in ldapsearch
...
Former-commit-id: 4ab1637c30cac2bb4c827b1e08017f6b08fae1b9
2019-02-15 09:10:21 +01:00
cd83f324a1
Auto-updated build strings.
...
Former-commit-id: 3efb9b48fb3cc1021d0b3e7752c3cd1607e863a5
2019-02-15 00:01:26 +01:00
7df9d4f78b
WIP: H&D merge
...
Former-commit-id: d53f7d5abed5cfc8d45e6a42bfd52089ff463ff3
2019-02-14 17:14:01 +01:00
52c4b3dab1
Merge branch 'ent-2806-Administracion_base_de_datos_de_historico' into 'develop'
...
add params setup historic database
See merge request artica/pandorafms!2154
Former-commit-id: ef832c053b6e678ec48c95a5494aa2b774b533ed
2019-02-14 17:00:56 +01:00
f849c2b0f0
Merge remote-tracking branch 'origin/develop' into ent-3426-No-desaparece-la-alerta-de-PhantomJS-en-windows
...
Conflicts:
pandora_console/include/styles/pandora.css
pandora_console/install.php
Former-commit-id: d74f5cb5c6ff0cc05542e63d1f8537f289eebfc8
2019-02-14 16:41:17 +01:00
40143a1402
fixed reports
...
Former-commit-id: 99e8d84b1db440156f8b382ded51be7c39322eed
2019-02-14 15:50:13 +01:00
04e8962cec
Merge branch 'ent-2967-6662-Error-504-en-vista-de-eventos' into 'develop'
...
Ent 2967 6662 error 504 en vista de eventos
See merge request artica/pandorafms!2167
Former-commit-id: 4096c814248a75bbe5e75858b31ee040379d6486
2019-02-14 14:55:33 +01:00
8acb658266
WIP: H&D
...
Former-commit-id: 7e74f1330b7e5cfdab3757ec62523942a1b4fe9f
2019-02-14 13:27:49 +01:00
3e9e668e00
Merge remote-tracking branch 'origin/ent-3430-discovery' into ent-3431-discovery-host-devices
...
Former-commit-id: e20038920481419abfaeddc665b3369f90b49fef
2019-02-14 10:59:27 +01:00
6e7369d672
Merge branch 'ent-3381-eventos-extendidos' into 'ent-3430-discovery'
...
Ent 3381 eventos extendidos
See merge request artica/pandorafms!2169
Former-commit-id: b8a4fd52a30b8cc34c2417499ce3b4a60c027edf
2019-02-14 10:51:04 +01:00
57991495e4
Use the CSV extension to import CSV on host and devices
...
Former-commit-id: ed95b09992ee681e35e7f934b8a8ac70c83bc8be
2019-02-14 10:30:01 +01:00
0fb61444f6
Merge remote-tracking branch 'origin/develop' into ent-2806-Administracion_base_de_datos_de_historico
...
Conflicts:
pandora_console/godmode/setup/performance.php
pandora_console/include/functions_api.php
pandora_console/install.php
Former-commit-id: e8fc07d1f10723700114949b30e9f3770208149e
2019-02-14 08:01:23 +01:00
444b5c4bfd
Merge remote-tracking branch 'origin/develop' into 339-No_cortar_elementos_en_PDF
...
Conflicts:
pandora_console/install.php
Former-commit-id: f26bcce527ebe225454700e8feca21610f91b20f
2019-02-14 07:51:53 +01:00
f91635c67c
fixed errors in pdf reports
...
Former-commit-id: fbc3598ab2dfd11cc2bfa850ba49b3e35481218d
2019-02-14 07:46:19 +01:00
f0338cd08e
Auto-updated build strings.
...
Former-commit-id: d0d40baca6720eb12b085a1968d827b8e9e767b0
2019-02-14 00:01:26 +01:00
c0dd81cab5
Merge branch 'ent-3277-Error_al_guardar_password_en_chequeos_wmi' into 'develop'
...
Fixed WMI passwords when encrypted
See merge request artica/pandorafms!2164
Former-commit-id: 7c2aeffb2849a3539569b2706b4ca613e1c632a8
2019-02-13 18:33:11 +01:00
5b4cadf138
minor style fix
...
Former-commit-id: ca2dcf89672832b7796c9b9cc555d36d9db503ec
2019-02-13 17:16:12 +01:00
f75a292b34
minor fixes/updates in notifications UI
...
Former-commit-id: d4f5b7db1b5a6f0a023e33c4b8cd55db7765b11a
2019-02-13 16:40:37 +01:00
f7134b6d81
Merge branch 'ent-3377-Bug_Manager_Update_Online_de_la_version_OpenSource' into 'develop'
...
Ent 3377 bug manager update online de la version open source
See merge request artica/pandorafms!2171
Former-commit-id: f353173953ab39af5bd6e1f39d41e37c7476618a
2019-02-13 15:56:19 +01:00
7f4353c4bc
optimized. events_has_extended_info
...
Former-commit-id: 2435badcea24fd5777bde358658409bf947a2d4b
2019-02-13 15:55:03 +01:00
453c639c53
optimized. events_has_extended_info
...
Former-commit-id: 805b80f1a9e09425b0e5710906886ae39e791753
2019-02-13 15:54:40 +01:00
4c809ba8d2
event query optimization
...
Former-commit-id: 322868d281ddeac4006480bac6dbf03434ffefa1
2019-02-13 15:41:34 +01:00
9951aadab3
Fixed typo
...
Former-commit-id: 469f46c34caefcb6b810e99f88a9223434959182
2019-02-13 15:04:53 +01:00
74e16b656b
Disable max postpone select
...
Former-commit-id: 43460b3304b70d6d0248ace672d51c2b48c3d22c
2019-02-13 15:03:59 +01:00
ed63ef47fa
Moved ReconServer to DiscoveryServer
...
Former-commit-id: 5e18aa75d669f6b45d3b4e2648f31473fd206091
2019-02-13 14:56:10 +01:00
0ecf2bb9c4
Added pandora db messages purgue
...
Former-commit-id: 23d1f55ac6b7d6d5470fa25860b9bbb1575875df
2019-02-13 14:43:55 +01:00
bf0fc07533
Merge branch 'develop' into 3219-Vista-de-custom-fields-diferente-nodo-meta2
...
Conflicts:
pandora_console/include/functions_events.php
Former-commit-id: 00b8cb47f7294fa6cd3c3fe257e18a1e56759580
2019-02-13 14:38:56 +01:00
855822f61e
Fixed arrow on notifications area
...
Former-commit-id: 6771d282bf7a6b5b9ddd0baec8a0a887f741d931
2019-02-13 12:44:30 +01:00
6a9e69adb1
Added changes
...
Former-commit-id: 0d0de6dba065aaaa5bbfc4b9f9790e4ef1b92b7d
2019-02-13 12:21:31 +01:00
b11d1a6687
Merge branch 'develop' into ent-3120-Cambio-de-radio-buttons-yes-no-por-checkbox-2-parte
...
Conflicts:
pandora_console/godmode/setup/setup_auth.php
pandora_console/include/functions_api.php
pandora_console/install.php
Former-commit-id: 70caf6f8d0b99057c55b21c8e3b4317a343923fb
2019-02-13 12:03:46 +01:00
fe50d6caff
Open toasts and messages into new window
...
Former-commit-id: ff3d565247225032219d4bbb5fa903bdae7730e8
2019-02-13 11:09:15 +01:00
eeb5f0e296
Merge remote-tracking branch 'origin/develop' into 339-No_cortar_elementos_en_PDF
...
Conflicts:
pandora_console/include/functions_reporting_html.php
pandora_console/install.php
Former-commit-id: 8f8f95cebc06d0a6802c6a7204a942658efa21f0
2019-02-13 08:02:46 +01:00
93edda07ee
fixed errors
...
Former-commit-id: 167c9a725e5dbd4f4ae1db0b6fb6c573a364c122
2019-02-13 07:55:21 +01:00
0e39e3fef7
Auto-updated build strings.
...
Former-commit-id: 7c2aabad85c99a55d80b3dc856c931f160cb35d7
2019-02-13 00:01:37 +01:00
48724fe033
Added onclick to notification-item's
...
Former-commit-id: 2e4833686b08b104b11ba9023f6eca38e0ed6bd9
2019-02-12 16:46:21 +01:00
4f158ed61b
Merge branch 'ent-3305-pandora-db-esta-reseteando-alertas-incorrectamente' into 'develop'
...
Validate alerts at the time agents/modules are modified.
Closes pandora_enterprise#3305
See merge request artica/pandorafms!2155
Former-commit-id: 6dead1fed27249ea1913e70530571d33b76cf3ff
2019-02-12 16:38:01 +01:00
cc2b2709f9
Show the notifications with AJAX
...
Former-commit-id: 73f407d13d3805dce879c1431311a4aaec00c152
2019-02-12 16:25:59 +01:00
35ea03ddf6
Fixed notifications global configuration. Do not disable the multiple selects.
...
Former-commit-id: c5148e3adad63300c2b938a78eb46974cceff761
2019-02-12 15:36:41 +01:00
325f5e8775
Added onclik con notification toasts
...
Former-commit-id: 7d0c7a7cc9dacc0e52c7f362a3301ed87a7205d3
2019-02-12 15:27:14 +01:00
fa7f519d34
Merged from develop.
...
Former-commit-id: 438c0bfa6cfa77ef0b75df02f3bce020122692b9
2019-02-12 14:52:18 +01:00
0b26faad87
Merge branch 'develop' into ent-3121-Report-tipo-general-salida-de-datos-booleanos
...
Conflicts:
pandora_console/install.php
Former-commit-id: 5f24ae2f22b85f461ee69c97b61f2ea3fd3c42f5
2019-02-12 13:54:52 +01:00
6e236c404b
Merge remote-tracking branch 'origin' into ent-3305-pandora-db-esta-reseteando-alertas-incorrectamente
...
Former-commit-id: fa717670f0b841f81f0f8ee566be36203cd7eba6
2019-02-12 13:47:44 +01:00
36dd59b250
Added changes without delete install.php
...
Former-commit-id: 686b0dc8e519283508f8f83ff663f6d3b79e7b80
2019-02-12 13:29:43 +01:00
af90734436
Revert "Merged from discovery and validated"
...
This reverts commit e744dd50eb
2019-02-12 13:29:04 +01:00
e744dd50eb
Merged from discovery and validated
...
Former-commit-id: af2047a38913f2763b68a8ec15b8f0cd58b8e676
2019-02-12 13:14:22 +01:00
166c3bbe88
Merge remote-tracking branch 'origin/ent-3430-discovery' into ent-3371-sistema-de-notificaciones-pandora
...
Former-commit-id: d630994f964e43b28197f4d26469fa1484d08ac2
2019-02-12 12:41:11 +01:00
42dc0c60be
supervisor
...
Former-commit-id: cf99e746a02ab3e921a39b19f6b4822580299b7e
2019-02-12 11:41:21 +01:00
bbd3cb79ce
Auto-updated build strings.
...
Former-commit-id: ca52afd38b1d242e4823639dd6c1e8cbc265ef04
2019-02-12 00:01:37 +01:00
851050f04e
message_edit.css added
...
Former-commit-id: f4e88b813dc1b39e50b0f997ace3768a10f406f1
2019-02-11 19:48:20 +01:00
332c53b098
change behaviour to avoid mr slow updates. Event extended
...
Former-commit-id: c5a6d5448a14b10b6851f59c5f688f360d747606
2019-02-11 19:46:46 +01:00
be8877563b
Merge branch 'ent-3371-sistema-de-notificaciones-pandora' of brutus.artica.lan:artica/pandorafms into ent-3371-sistema-de-notificaciones-pandora
...
Former-commit-id: 5a0ef1ab4b8627f72158e3d012dd1d65e9852bcc
2019-02-11 18:28:05 +01:00
0dbabd3ba3
Improved conversation view (messages) some filters and fixes in functions_messages
...
Former-commit-id: 13597c6556939bbe772d5ed749930e30e5377c47
2019-02-11 18:28:00 +01:00
c355a581ff
Added toasts to notifications
...
Former-commit-id: 7429bf8d9c4f4e8bb16549172a59c33d22185821
2019-02-11 17:53:37 +01:00
4aae62ba36
Fixed error in reports
...
Former-commit-id: d3ad6cd8e1dd052fedc3dfe65bd5938537033f34
2019-02-11 17:05:05 +01:00
8beba4569a
Merge branch 'develop' into ent-3120-Cambio-de-radio-buttons-yes-no-por-checkbox-2-parte
...
Conflicts:
pandora_console/install.php
Former-commit-id: b910529699b6e6afaeea286ac43c89779b11a26e
2019-02-11 16:26:58 +01:00
d2649bb51c
fixed double count in read messages
...
Former-commit-id: e3661ad675c7dcd70fbea3bc5a41b3f103a376a0
2019-02-11 15:28:38 +01:00
2ebbaf83c5
Merge branch '3241-Etiqueta_en_el_Menu_de_la_metaconsola' into 'develop'
...
Fixed Label in the Console Menu
See merge request artica/pandorafms!2123
Former-commit-id: ec997b149c6c480f74cb4fd71b7bc600cec40c19
2019-02-11 14:58:05 +01:00
7893827652
fixed query notifications pending
...
Former-commit-id: ac8c5b5cb1276c16b9339e2e86c88d856540be0d
2019-02-11 14:51:59 +01:00
e51864ac6f
Merge branch 'ent-3392-7367-estado-de-elemento-incorrecto-en-consola-visual' into 'develop'
...
Fixed agent status in visual map
See merge request artica/pandorafms!2148
Former-commit-id: d2dd7165a3dac9228948b8a1b8878b9fb3e2b491
2019-02-11 14:49:59 +01:00
1223ce69da
Added missing docs
...
Former-commit-id: d0477e479f4ba4d138112de73746ca8173c9d563
2019-02-11 13:49:03 +01:00
a50a251b00
Added filter to get last messages by notification ball
...
Former-commit-id: 57619fe6cd46f3f723c5b2c3bdbe3aa9ba155a0c
2019-02-11 13:35:36 +01:00
e6dc69e3be
Added last_id to notification ball
...
Former-commit-id: f7095e633ce5799cf79bd20393e13e5b6233bf4c
2019-02-11 13:05:31 +01:00
b9a09cef45
fixed bug in functions_reporting_html
...
Former-commit-id: 53fd11f9b6ff51c55c0009b1e1448834ed7f0161
2019-02-11 12:11:23 +01:00
99c0da3a06
Merge branch 'develop' into ent-3121-Report-tipo-general-salida-de-datos-booleanos
...
Conflicts:
pandora_console/include/functions_reporting.php
pandora_console/include/functions_reporting_html.php
Former-commit-id: 10d4c89ad8c6a124c9f31634dc4183e7380d49d7
2019-02-11 11:11:56 +01:00
3acd6b8d31
Auto-updated build strings.
...
Former-commit-id: bb603dd63396712b8a649e3c08320653021c1289
2019-02-11 00:01:26 +01:00
56797e717b
Auto-updated build strings.
...
Former-commit-id: 728a4013a020328735f2e76b4ecb49e87d815d10
2019-02-10 00:01:25 +01:00
f992e7b1f4
Auto-updated build strings.
...
Former-commit-id: 7eb19cce56cb06b70ee9269f4b51d7b45b19f5d9
2019-02-09 00:01:35 +01:00
e1d87ce0c8
minor fix falsse => false
...
Former-commit-id: 938e161b179736a3b72cad3f35db90a02e5d632c
2019-02-08 19:09:36 +01:00
49cf9d5db0
Extended events
...
Former-commit-id: f2e0925ce58042dc9c9505a0d0fcf1a424c8a0bb
2019-02-08 19:07:49 +01:00
d5d58e5b2b
Added outter shadow to notifications messages box
...
Former-commit-id: 1eed4b4f2ef7d58dbab73ccb2628bb0ef9ffc7ca
2019-02-08 18:53:28 +01:00
091f6ace96
minor fixes and revised code style
...
Former-commit-id: aad587c578de99432dd759d6c82b622f6cd6c6e7
2019-02-08 17:30:47 +01:00
76259c3026
Merge branch 'develop' into ent-3120-Cambio-de-radio-buttons-yes-no-por-checkbox-2-parte
...
Conflicts:
pandora_console/include/styles/pandora.css
pandora_console/install.php
Former-commit-id: 1ab951e0bf8984214f30d71c9585d232ba7c182c
2019-02-08 15:03:59 +01:00
801d67e690
Merge remote-tracking branch 'origin/develop' into ent-2806-Administracion_base_de_datos_de_historico
...
Conflicts:
pandora_console/install.php
Former-commit-id: 0176b7cddb80b80e9a56571f89559a17e525cb79
2019-02-08 14:35:58 +01:00
0124bd0a17
Added real notifications (not AJAX jet)
...
Former-commit-id: 5d0dee32c4fb96ad8dcb4f3f70049e1d1c4936fc
2019-02-08 14:23:05 +01:00
16c742bd83
fixed report pdf
...
Former-commit-id: 442a90512fbb244154749ddefe0007cef65655c5
2019-02-08 14:10:19 +01:00
4b86683d23
Fixed style
...
Former-commit-id: bd4c0370bb3c63eddb9a7b36b0e8f6938c48b4ae
2019-02-08 11:39:17 +01:00
63d589c918
Parameter changes deprecated in LDAP
...
Former-commit-id: 2accf38ffe089c19475b1956cf04da7769dca2e9
2019-02-08 11:34:47 +01:00
80a5d0b0b9
Removed unused code and format some files
...
Former-commit-id: 5f8da31efc5241dd16002565fdb89d774072b7b3
2019-02-08 10:32:04 +01:00
e6abb61a13
Auto-updated build strings.
...
Former-commit-id: 0f011fb8fe35e16e311b4cd0f946fec051170c32
2019-02-08 00:01:29 +01:00
e90d4b7256
Supervisor added blacklist to avoid mail twice
...
Former-commit-id: e2f03306076d90f9abe312694ea1fa2298ee7c62
2019-02-07 18:29:20 +01:00
42b0afb884
Supervisor minor fixes
...
Former-commit-id: 84171e197df0a016a9a4b7d0e49f0412b65ee864
2019-02-07 18:07:52 +01:00
04b2cb8665
Use real ids instead fake ids
...
Former-commit-id: 2360a14d1865f918247d23b2f3181626052cad60
2019-02-07 18:04:14 +01:00
681ad67028
ConsoleSuperviso - mailing support and minor fixes
...
Former-commit-id: 86db19d675aa2b7ea37af2839764245fde9ee3c4
2019-02-07 18:00:51 +01:00
7fa344c2a4
Change the global configuration notification to AJAX
...
Former-commit-id: a9017377c8ed6780170c0f418ec3e9bc39f7782c
2019-02-07 17:53:09 +01:00
b96bf0e4b0
Fixed conflict
...
Former-commit-id: 9db99a8652b794c3e98c0372de6a43066886c5e4
2019-02-07 17:33:43 +01:00
dc9decde42
ConsoleSupervisor
...
Former-commit-id: 3c40e628883f032a449862d0161659586819e6df
2019-02-07 16:24:49 +01:00
8054809dda
Merge branch '2931-Fallos_en_el_conteo_de_modulos_en_la_tabla_tagente' into 'develop'
...
Added new functionality in CLI and API to update module counts and alert counts
See merge request artica/pandorafms!2133
Former-commit-id: e5ee2c87fc7281ece82ace2d8b5654a1c278f60a
2019-02-07 13:10:56 +01:00
f4c22d2250
added extra arguments to get_snmpwalk
...
Former-commit-id: bf02258e312d3a81673e79a144173b53e0c2c153
2019-02-07 13:01:21 +01:00
fb814680db
Added some well formatted docs
...
Former-commit-id: 30aa9de2e1b3835f96adf2fbec24bfd5ab17e7c2
2019-02-07 12:57:51 +01:00
d5fb9f1051
Added AJAX to user notification config window
...
Former-commit-id: 9ca09ae777d699588a76dfb619156d800a95895b
2019-02-07 12:22:50 +01:00
6dbeaf6307
Added more attributes to swith HTML element
...
Former-commit-id: aa567ef6f16e1e89489b16f808b00e772866ef86
2019-02-07 12:20:34 +01:00
92e2262440
Merge remote-tracking branch 'origin/develop' into ent-3305-pandora-db-esta-reseteando-alertas-incorrectamente
...
Former-commit-id: 1e778938d7fc1ac575e110503803d8f3ac6b6e83
2019-02-07 11:18:15 +01:00
4d4b8bbc0d
Merge remote-tracking branch 'origin/develop' into 339-No_cortar_elementos_en_PDF
...
Conflicts:
pandora_console/include/styles/pandora.css
Former-commit-id: 792472b0cc9b3f1ae56894c53407419c7fbd573e
2019-02-07 10:30:23 +01:00
f05011956f
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: cbe20ba58ef82cd1d8c833f34b20e74f16062434
2019-02-07 09:02:56 +01:00
4c2215a3db
Merge remote-tracking branch 'origin/develop' into 3446-Imagen-grupos-no-se-muestra-None
...
Conflicts:
pandora_console/install.php
Former-commit-id: bc20f50737c115ade0034b4ca9e6d4cab26d35e6
2019-02-07 08:59:45 +01:00
8e20aab9f5
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: 71af17b203571dacf4f5e1976a0a8599d5b8730d
2019-02-07 08:43:18 +01:00
f14684b22d
Merge remote-tracking branch 'origin/develop' into ent-2806-Administracion_base_de_datos_de_historico
...
Conflicts:
pandora_console/godmode/setup/performance.php
pandora_console/godmode/setup/setup.php
Former-commit-id: 9a96a30cc97d2d2af707d7cd89b5a1e6ad0d0746
2019-02-07 07:58:33 +01:00
1f3fe51f69
Auto-updated build strings.
...
Former-commit-id: 984f5cc8c4bf0b5adb68d7bfe86e171f7b748f77
2019-02-07 00:01:40 +01:00
9ea3980b26
wip supervisor
...
Former-commit-id: 991922a7dd18ace8fd831d02ada2cf20e81d27c2
2019-02-06 20:22:22 +01:00
9c623148f5
Fixed conflict
...
Former-commit-id: 02b3e0656041e5bdadf295177f0c29a81abf8c3f
2019-02-06 19:14:46 +01:00
fcb9275d11
Fixed conflict
...
Former-commit-id: 7aeb505d4d2b8e11f72e5b841eec557d4afc1b6d
2019-02-06 19:09:09 +01:00
f098b72fe4
Merge branch 'ent-3274-Retoque-visual-vista-SNMP-interfaces' into 'develop'
...
Fixed height in slicesbar graph of table interface snmp - #3274
See merge request artica/pandorafms!2144
Former-commit-id: c4e83cd7a6525aae2a567a90b3fb7d4d1ebb70bf
2019-02-06 18:56:47 +01:00
986dfcb74d
Added basic and dummy user edit notifications
...
Former-commit-id: d0395c5b2cbc870812e54e15db523eeaac94557f
2019-02-06 18:20:26 +01:00
37d02ddf59
Added disabled status to switches
...
Former-commit-id: 7fee49f58e4be84bfb8bad08303b203d71dafe16
2019-02-06 18:18:48 +01:00
9568cc9aba
Merge remote-tracking branch 'origin/develop' into 1744-Opción-para-validar-que-la-ip-de-un-agente-sea-unica
...
Conflicts:
pandora_console/godmode/agentes/agent_manager.php
pandora_console/godmode/agentes/configurar_agente.php
pandora_console/include/functions_config.php
Former-commit-id: 19f087050477dcc099bd31d7de62ac893de5d686
2019-02-06 18:06:49 +01:00
f1f929bfe4
Merge branch 'develop' into 'ent-3392-7367-estado-de-elemento-incorrecto-en-consola-visual'
...
# Conflicts:
# pandora_console/include/functions_visual_map.php
Former-commit-id: 07e2add1d1e20f292d7bae05bcaa6452c92e4543
2019-02-06 17:37:23 +01:00
d113bfbeb8
Merge branch 'develop' into ent-3120-Cambio-de-radio-buttons-yes-no-por-checkbox-2-parte
...
Conflicts:
pandora_console/include/styles/pandora.css
Former-commit-id: 57658aa74a36e6ca9bc53af58e3732e895cf977c
2019-02-06 17:02:58 +01:00
9f7ab61766
Merge branch '3358-Mejora-en-la-aplicación-de-estilos' into 'develop'
...
3358 mejora en la aplicación de estilos
See merge request artica/pandorafms!2161
Former-commit-id: ef392bbd62ec9df99964d2057e23e35e334cb6c7
2019-02-06 16:34:00 +01:00
dee7c769f2
Merge branch 'develop' into ent-3120-Cambio-de-radio-buttons-yes-no-por-checkbox-2-parte
...
Conflicts:
pandora_console/godmode/setup/performance.php
pandora_console/godmode/setup/setup_auth.php
pandora_console/godmode/setup/setup_ehorus.php
pandora_console/godmode/setup/setup_general.php
pandora_console/godmode/setup/setup_visuals.php
pandora_console/include/styles/pandora.css
modificado: pandora_console/include/functions_html.php
Former-commit-id: feaf2f5d3defda182f9cdaf151854257aeba1b22
2019-02-06 16:11:46 +01:00
19c5a1c844
fixed error pdf
...
Former-commit-id: 2a81a654df0c216951c61f36ff31a05ce5f7e29a
2019-02-06 15:58:36 +01:00
b805fe594e
Merge remote-tracking branch 'origin/develop' into ent-3274-Retoque-visual-vista-SNMP-interfaces
...
Conflicts:
pandora_console/include/functions_reporting_html.php
Former-commit-id: d096025f7a166160598f9fb26fe17c60809c9c3e
2019-02-06 15:34:06 +01:00
a3aca91765
Fixed WMI passwords when encrypted
...
Former-commit-id: 7cadbe954ddd7c6878a58a7fbae13ab984ddb736
2019-02-06 15:26:43 +01:00
cc17cbf60f
Merge remote-tracking branch 'origin/develop' into ent-3426-No-desaparece-la-alerta-de-PhantomJS-en-windows
...
Conflicts:
pandora_console/include/functions_config.php
Former-commit-id: 3456fcc7a45639055010e67440601ac4fba547ec
2019-02-06 15:22:05 +01:00
b8aab972c9
Merge remote-tracking branch 'origin/develop' into 3446-Imagen-grupos-no-se-muestra-None
...
Conflicts:
pandora_console/godmode/groups/group_list.php
Former-commit-id: 6f928cc0a3ce2d4822affc7444254393d1d47b69
2019-02-06 15:14:22 +01:00
27495845ba
Merge remote-tracking branch 'origin/ent-3371-sistema-de-notificaciones-pandora' into ent-1959-cron-supervisor-de-estado
...
Former-commit-id: 500d7bb0d6e05093cfa3d7557fb8af6f22c410c7
2019-02-06 12:53:02 +01:00
6ddcfcbb19
Fixed code style lintern
...
Former-commit-id: d7757a56f8368761776f80f826600d601b56b6d9
2019-02-06 12:51:02 +01:00
77c92ba5ab
Merge remote-tracking branch 'origin/ent-3371-sistema-de-notificaciones-pandora' into ent-1959-cron-supervisor-de-estado
...
Former-commit-id: 982b806890f05118d71c6424a8879168c3a00028
2019-02-06 11:49:20 +01:00
c0a23889ab
Auto-updated build strings.
...
Former-commit-id: ad456bf0e4cb361694afa246a9348e5b87b85a94
2019-02-06 00:01:29 +01:00
6f87b436d0
minor fix
...
Former-commit-id: 3fabf2561773365932c5d33e8bf9e42b7ed4e7f0
2019-02-05 18:47:41 +01:00
ddcf0bbd16
Added deletion on global notification config
...
Former-commit-id: 2356bbe374e5decf929cfaaf2fc4776611b0652d
2019-02-05 18:14:10 +01:00
7df3fe2dac
Added functionallity to Add element on notification global config
...
Former-commit-id: b51cf2d5079019a69fd7c4344dfcff2bf38147db
2019-02-05 17:40:44 +01:00
8811257762
Popup to add groups and sources to global notification configuration
...
Former-commit-id: 481812290ea1d1446aa7378ab6a935139483c8a0
2019-02-05 13:36:16 +01:00
0b72571c7c
Added NOT IN in format mysql filter
...
Former-commit-id: f3a8cdd6923834443ed7223d1e6ad7776b861184
2019-02-05 12:53:57 +01:00
418d497291
fixed errors pdf
...
Former-commit-id: f7ad69f6b5e0910e5f31464ddfe94593529ef6a7
2019-02-05 10:40:24 +01:00
9baa3dcfa2
Merge remote-tracking branch 'origin/develop' into 3358-Mejora-en-la-aplicación-de-estilos
...
Conflicts:
pandora_console/extensions/agents_modules.php
pandora_console/extensions/module_groups.php
pandora_console/general/login_page.php
pandora_console/godmode/alerts/alert_list.builder.php
pandora_console/godmode/alerts/alert_list.list.php
pandora_console/godmode/gis_maps/configure_gis_map.php
pandora_console/godmode/groups/group_list.php
pandora_console/godmode/reporting/visual_console_builder.data.php
pandora_console/godmode/reporting/visual_console_builder.editor.php
pandora_console/godmode/reporting/visual_console_builder.elements.php
pandora_console/godmode/setup/setup_visuals.php
pandora_console/include/chart_generator.php
pandora_console/include/functions_networkmap.php
pandora_console/include/functions_pandora_networkmap.php
pandora_console/include/functions_ui.php
pandora_console/include/functions_visual_map_editor.php
pandora_console/include/styles/common.css
pandora_console/include/styles/countdown.css
pandora_console/include/styles/datepicker.css
pandora_console/include/styles/dialog.css
pandora_console/include/styles/help.css
pandora_console/include/styles/menu.css
pandora_console/include/styles/pandora.css
pandora_console/include/styles/pandora_forms.css
pandora_console/operation/agentes/estado_monitores.php
pandora_console/operation/agentes/interface_traffic_graph_win.php
pandora_console/operation/agentes/realtime_win.php
pandora_console/operation/agentes/stat_win.php
pandora_console/operation/events/events.php
pandora_console/operation/snmpconsole/snmp_view.php
pandora_console/operation/tree.php
pandora_console/operation/visual_console/render_view.php
Former-commit-id: 87793fc5a319121753f591da7949ad0ff3bd72b1
2019-02-05 09:23:53 +01:00
97259bc285
Auto-updated build strings.
...
Former-commit-id: e3473dde27b1cc8aaa1ae555158171d25941710f
2019-02-05 00:01:28 +01:00
89af077b52
Servers get server string name
...
Former-commit-id: e67755e9a86872ba65c5768191cba80fbd879322
2019-02-04 19:16:50 +01:00
53947de42a
minor changes - constants style
...
Former-commit-id: 3482cb88dc0884ea3c1742eb8fef4ac7c603a849
2019-02-04 19:14:02 +01:00
20e0508e01
fixed pdf report
...
Former-commit-id: 515b8f06f3584c6aaa1a32ea29a2f555e7afccad
2019-02-04 12:10:52 +01:00
54f0bc1a03
Disable selec boxes when click notify all users on notifications global config
...
Former-commit-id: 93a3a0007a3a8dfabfec5d0b9ead7d185aeee81b
2019-02-04 11:02:52 +01:00
d2a3d3bbbc
Added all users in global notifications config
...
Former-commit-id: d4bf0067f3ffe2e4fdef25158579716bdfd78d5d
2019-02-04 10:41:35 +01:00
4c735762dc
Merge branch 'develop' into cursed-format-change
...
Former-commit-id: a986a0245f7f0cce5ea7fc3c33503bc53e85242a
2019-02-04 09:11:39 +01:00
af1f081e5c
Auto-updated build strings.
...
Former-commit-id: e75f41146e01ab55222c3b4176a50aee7e9246df
2019-02-04 00:01:33 +01:00
934533141e
Auto-updated build strings.
...
Former-commit-id: ac84c1e47dd82d12c0b83a0a79b044ca26fc8d8e
2019-02-03 00:01:26 +01:00
24e799f18e
Auto-updated build strings.
...
Former-commit-id: 0e390ddd2b2294dbd043bc7c94dd9a82c228c80f
2019-02-02 00:01:29 +01:00
50030b6933
Added notify all users and disable on first load
...
Former-commit-id: d193a8375ce00f3f2cf2c1fc181d4eef47c92eb2
2019-02-01 14:48:52 +01:00
a8b85d2593
Added missing docs
...
Former-commit-id: 807c7466b60e4c8ecb77fb8d94102300e9bcd780
2019-02-01 13:53:22 +01:00
315a51c5e7
Added only read selector global notification setup
...
Former-commit-id: bd6262cda30c0bb5a63b106e6c3832efbcfc63b9
2019-02-01 13:46:58 +01:00
d38236091b
Format fixes
...
Former-commit-id: 58823652a8bda566d0b0e340a1249abb4f7f219e
2019-02-01 09:55:29 +01:00
62461525e8
Auto-updated build strings.
...
Former-commit-id: 899c65040831974e16b76b37348dea7d428a7af3
2019-02-01 00:01:36 +01:00
1c0a5ca247
Added pospone select (fixme)
...
Former-commit-id: 428b4424a15ef54c4d95a2eb4af07a334366577a
2019-01-31 20:11:43 +01:00
75eaa875c9
Added checkboxes to notifications global configuration
...
Former-commit-id: 79df159f003292dfef697773fe8daa25b77f04c2
2019-01-31 19:43:13 +01:00
01bc0775bc
Added notification global configuration (only enable and disable)
...
Former-commit-id: 850d4dd1d8e30fc66623308b8ab148eaeadb5015
2019-01-31 19:13:51 +01:00
b589826c86
Added HTML switch element
...
Former-commit-id: 426557a47577fd9b5b2002ed02d70f1effb92162
2019-01-31 19:11:59 +01:00
397f2964da
Added messages notification ball
...
Former-commit-id: c44a99cf63bc7451890389e4d234fd8aa7b62cbc
2019-01-31 15:16:56 +01:00
229c60c5cc
Merge branch 'develop' into cursed-format-change
...
Former-commit-id: a3dfd193c81af0ebe0549dc2a9c953aac98b5f68
2019-01-31 09:42:10 +01:00
d6667354fc
Auto-updated build strings.
...
Former-commit-id: 166da74dd65e72a242b58cf10f4c564496b76fe9
2019-01-31 00:01:24 +01:00
3f81e60df2
wip messages
...
Former-commit-id: 7852ce90b3f2681a0134a651812341f7fac00c53
2019-01-30 17:33:31 +01:00
b3da2803a4
Changed the format of the .php files
...
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
2019-01-30 16:18:44 +01:00
406c062a3c
WIP messages, usable
...
Former-commit-id: 79e0b38fe7499642480505aac088ef8b45b04714
2019-01-30 13:29:46 +01:00
2626605030
Validate alerts at the time agents/modules are modified.
...
Former-commit-id: de1f4d5bbf7abda60a99b3a9718727f73657be75
2019-01-30 12:58:31 +01:00
7a9684f23c
Changed the format of the .css files
...
Former-commit-id: a0dce3fe780031105396a8439c83d520197670af
2019-01-30 12:42:16 +01:00
dc238cf74a
Changed the format of the .js and .html files
...
Former-commit-id: 7a06315787b85355f4840cbfb0431d55dea4293d
2019-01-30 12:27:18 +01:00
fa6c4d5bc9
notifications, WIP: new lib defined
...
Former-commit-id: 430ac2e090f91403fc074d2a9b37ab36de10d5a9
2019-01-30 11:56:47 +01:00
6485de04fd
Auto-updated build strings.
...
Former-commit-id: b5071a47e475e0aa13a62e9e76066cfd10d99ec1
2019-01-30 00:01:26 +01:00
edd96e75ab
Merge branch 'ent-3450-Error-informe-dinámico-al-marcar-una-gráfica-por-cada-agente' into 'develop'
...
Fixed auto combined graph in metaconsole
See merge request artica/pandorafms!2146
Former-commit-id: c25a50e5176dcb2996df04ebcee3907cc444b56e
2019-01-29 19:14:15 +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
cc27f0451a
Fixed auto combined graph in metaconsole 2
...
Former-commit-id: 672531931421175354f2a877ac295c1763107756
2019-01-29 17:12:24 +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
fad670f322
Fixed agent status in visual map 2
...
Former-commit-id: 3294be4d9d8f66edd477486a50130920144d40f7
2019-01-29 14:44:56 +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
2fc1e9715c
Fixed agent status in visual map
...
Former-commit-id: b321113da85364845ddbf31e55bd0c4442eb488c
2019-01-29 11:55:08 +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
e03b62d168
Fixed auto combined graph in metaconsole
...
Former-commit-id: c0e819e35fbb5952fa8ce2806e9cddff521a5131
2019-01-28 18:05:46 +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
ad368ed09b
Fixed height in slicesbar graph of table interface snmp - #3274
...
Former-commit-id: ebfb44b1bfe9c6d2cfb9e95a982ae169f0c631a4
2019-01-28 12:15:05 +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
4d4569cadb
Fixed error with slashes - #3426
...
Former-commit-id: 8dbead7acd73faa66e406cccf1fe81ed775eb933
2019-01-25 13:52:49 +01:00
7d4fc056ca
fixed errors Qa
...
Former-commit-id: 9eea2ee2a3ec6bd51d0e7ef88b560e0475fe7504
2019-01-25 11:18:15 +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
335abb9abc
fixed error css
...
Former-commit-id: d2be8c4cf4306cb51c9b3854cbe06d4c80119d8b
2019-01-25 09:54:53 +01:00
d191cdef17
Auto-updated build strings.
...
Former-commit-id: 0c056fa59423bd4342f513f80bd0a49a9df0dddd
2019-01-25 00:01:33 +01:00
3cd9d22f1e
Merge branch 'ent-3441-no-se-esta-comprobando-bien-el-modo-centralizado-en-el-nodo' into ent-2516-api-listar-y-crear-modulos-de-inventario-6170-eucomm
...
Former-commit-id: 577301035cbde2dee5e7a001e48aab50a482a0ec
2019-01-24 14:56:23 +01:00
072ad0a1ea
Add return value to generate_hash_to_api function
...
Former-commit-id: b6420e14ab59c08c661a11763edaaa52ad612af8
2019-01-24 13:38:13 +01:00
f5c96b7e5d
New organization of CSS files - #3358
...
Former-commit-id: 8512adc7742eecb64db2b0ee539acfddd33406c2
2019-01-24 11:10:49 +01:00
f9113fa2e5
Auto-updated build strings.
...
Former-commit-id: 4593b36762b46a3b621d39318cb7a9e5b437db52
2019-01-24 00:01:27 +01:00
48eea4ab87
Added centralized error code to API
...
Former-commit-id: 0400f0047276d08182477b4d4c59d42c665189c7
2019-01-23 19:21:02 +01:00
687358d70c
add new token treshold IPAM
...
Former-commit-id: cc7858af6a83b0773fec3249e13cfbfb274f2fba
2019-01-23 17:33:06 +01:00
5d8360860d
fixed error include in API not necessary
...
Former-commit-id: a1520c5b4438d559fd98bba4daafd80fb854a406
2019-01-23 17:06:31 +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
fb46197c1f
fixed minor error button
...
Former-commit-id: 4b57425285d33d181390090fbdd3c36882ab4fcf
2019-01-23 15:30:46 +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
65fce762df
Merge branch 'Informes_Event_report_group_no_se_visualizan_exportan_2' into 'develop'
...
Fixed Event reports pie graphs in metaconsole
See merge request artica/pandorafms!2128
Former-commit-id: d134417a05ddb7fd323d8ed4cba93e21e2551f7f
2019-01-22 14:30:45 +01:00
d8ca12bd63
Merge branch 'ent-3296-Descarga-informe-CSV-con-Graficas-no-funcionan' into 'develop'
...
Fixed bug in export to csv report
See merge request artica/pandorafms!2135
Former-commit-id: 04d0af4a61212057c7e539fc4513e2b45a2bc31a
2019-01-22 14:06:59 +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
0f29d6461e
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: b7873c08910f08827387db6d92d8a656d8ca4bf2
2019-01-22 08:57:59 +01:00
2c208b5e29
fixed errors php7 mysqli and warning include
...
Former-commit-id: 68bdf4c26530de45efe2dd8fab360fb88c8976bc
2019-01-22 08:57:48 +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
4c6cd847bd
Fixed bug in export to csv report
...
Former-commit-id: 4bb84abbbb42945974643207f4976131753ab257
2019-01-21 16:19:22 +01:00
fbsanchez
Daniel Rodriguez
fermin831
artica
daniel
Alejandro Fraguas
manuel
Alejandro Gallardo Escobar
Ramon Novoa
Tatiana Llorente
alejandro-campos
Daniel Maya
samucarc
artica