d4f5482e99
Added custom field combo values in agent custom field
...
Former-commit-id: 55ca33d3de14c868e1eec3f32179b33dc3ff589b
2019-03-07 13:37:36 +01:00
06705e7e25
Merge branch 'ent-3498-Anadir_parametros_manualmente_en_respuestas_de_eventos_masiva' into 'develop'
...
add new functionality in event response
See merge request artica/pandorafms!2212
Former-commit-id: e32962100f2f2b71f1977f29e10c0772b6c27e17
2019-03-07 11:13:36 +01:00
2d6636bb51
Revert changes on dbmanager.php
...
Former-commit-id: 3c9eaec695b923ea81f60d8dcfb5716af6515e37
2019-03-07 10:36:06 +01:00
798567bf8e
fixed minor errors change word command for parameters
...
Former-commit-id: 6e6e56bded99331c606f7a9f6179826afee22d16
2019-03-07 09:05:38 +01:00
f79400ecfb
Merge remote-tracking branch 'origin/develop' into ent-3498-Anadir_parametros_manualmente_en_respuestas_de_eventos_masiva
...
Former-commit-id: 76e5afc943bd05e89a82efbe091db42d1e0a4e8d
2019-03-07 08:32:40 +01:00
20a0a64149
Merge remote-tracking branch 'origin/develop' into 3243-SNMP_Browser_Wizard_no_buscan_en_el_exec_server_solo_lo_hacen_en_local
...
Former-commit-id: 8cd0faa32438d2f8f14c409a64c24a4684b3d16f
2019-03-07 08:19:39 +01:00
f224ec19de
Merge remote-tracking branch 'origin/develop' into ent-2674-Nueva_macro_event_timestamp
...
Former-commit-id: 3f8a5700ea1555758a56bc47eb219d00cb5df34f
2019-03-07 08:16:19 +01:00
4eb6c16339
Auto-updated build strings.
...
Former-commit-id: 4c22b36dac2410ec75f5cae1c0e6ec7b81e5d78f
2019-03-07 00:01:27 +01:00
e79e2a4fbc
Finished
...
Former-commit-id: 529f6297404b74dc41af77ae672a034530f18727
2019-03-06 17:25:36 +01:00
d760c7d701
fix bug in functions_filemanager
...
Former-commit-id: 93507790a70eb673a5660357acfcdf9c68279047
2019-03-06 17:07:37 +01:00
18ca3a191b
ticket changed
...
Former-commit-id: 532d461aa9ff0c956dbbe0dd931dc6f03d56498b
2019-03-06 16:47:56 +01:00
9e87585e4b
Merge branch 'ent-3618-meter-las-dependencias-del-modo-debug-en-la-imagen-de-docker' into 'develop'
...
Added debugger and profiler deps to Dockerfile
See merge request artica/pandorafms!2220
Former-commit-id: 82ba7af10d0d644fc91e2af5d0a43b21afa6f27d
2019-03-06 15:47:55 +01:00
9152e2f236
Merge branch 'ent-3504-Bug-pandoradbmigrate' into 'develop'
...
add changes to migrate script
See merge request artica/pandorafms!2214
Former-commit-id: 24ef182bbdf7b7daabb613e865c88befaec09acc
2019-03-06 14:27:56 +01:00
7ded65d162
Merge branch 'ent-3432-Nueva-cabecera-y-menu-lateral' into 'develop'
...
Ent 3432 nueva cabecera y menu lateral
See merge request artica/pandorafms!2240
Former-commit-id: ea97a0795a923bb4a72d30c96de90490fb3a879b
2019-03-06 10:59:13 +01:00
acc44ff9ce
Merge branch 'develop' into 'ent-3432-Nueva-cabecera-y-menu-lateral'
...
Conflicts:
pandora_console/install.php
Former-commit-id: 35214830b309620c88c44b32f93cfae93775e9a8
2019-03-06 09:18:38 +01:00
b2bf411608
Resolve conflict with install.php - #3432
...
Former-commit-id: 7b082b9f2f4aaae5dd2218abc6ae67d17640735e
2019-03-06 08:59:41 +01:00
88f1f16a5a
Auto-updated build strings.
...
Former-commit-id: 4e42c790d0cc4e621a9cd231c77b3d04fc8443c4
2019-03-06 00:01:33 +01:00
63cd5fe018
Merge branch 'ent-3530-SNMP-event-graph-not-working' into 'develop'
...
Fixed width unit on graph, setted to px instead of %
See merge request artica/pandorafms!2234
Former-commit-id: 52caaa0de71150e62616b363471aa4bafadf4fcb
2019-03-05 18:06:45 +01:00
4943521904
fix pandora migrate script
...
Former-commit-id: 0d66837bf3f842aed32c3c64edc2608580d6ed7f
2019-03-05 15:28:39 +01:00
6bc73b54cb
Merge branch 'ent-3529-7431-conteo-de-agentes-deshabilitados-en-metaconsola' into 'develop'
...
Fixed downtimes disabled and enabled agents
Closes pandora_enterprise#3529
See merge request artica/pandorafms!2205
Former-commit-id: dc624b9b6f73ca1a56527c71ba4b0495ad219aaa
2019-03-05 14:43:10 +01:00
590accf90c
Merge branch 'ent-3403-Pantalla_en_blanco_con_credenciales_erroneas_en_config_php' into 'develop'
...
Added new alert when failed database
See merge request artica/pandorafms!2229
Former-commit-id: b2fef57a8988766b75c048542c746977f03aba4e
2019-03-05 13:42:33 +01:00
033eb2ff7c
Fixed problem with install.php #3432
...
Former-commit-id: 7b1ac63e6a032fe2b1511c15e783fc5bbb6ac537
2019-03-05 13:33:29 +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
7be5d3e9e0
new header and menu
...
Former-commit-id: 7a36ca23fc302cf3b86dca26971ce591107b66e8
2019-03-05 12:54:11 +01:00
f817a94609
Merge branch 'ent-3319-ldap-save-password-conf-not-saving' into 'develop'
...
Fixed ldap conf tooltips
See merge request artica/pandorafms!2238
Former-commit-id: 355e217947287e500ea146a8f3777ec1cb3bc219
2019-03-05 10:34:15 +01:00
2ceba76d22
Fixed ldap conf tooltips
...
Former-commit-id: 957a6c1d90ce99630fa2327c829f178561192a50
2019-03-05 09:09:24 +01:00
930c527ad2
Auto-updated build strings.
...
Former-commit-id: 2bf7188690fce3ac4ff2b8d124b552f6a6f7d608
2019-03-05 00:01:26 +01:00
9d7c6854a8
fixed error in snmp browser change server
...
Former-commit-id: 0545012dd8526bdf4cc836af2d263af7b5ca5328
2019-03-04 15:33:36 +01:00
1cfabda53e
Merge branch 'ent-3224-7026-anadir-token-agent-name-as-alias-a-importacion-de-agentes-por-csv' into 'develop'
...
Modified agents_create_agent to permit create agents with name as alias
See merge request artica/pandorafms!2209
Former-commit-id: ef47fc540cedd0c06b58805a3fb162d5807ecc32
2019-03-04 13:22:56 +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
3ed6a2b089
Auto-updated build strings.
...
Former-commit-id: d8e95284d6eded43b5d1af26b172a034a06d3bed
2019-03-04 00:01:22 +01:00
62c7e8dffc
Auto-updated build strings.
...
Former-commit-id: dd2dc5dcc124d58611076b2e38dd65a596c23f3b
2019-03-03 00:01:24 +01:00
b194d439d2
Auto-updated build strings.
...
Former-commit-id: 8081bea8a9b82eca462bc1ae7b600162a08faea6
2019-03-02 00:01:29 +01:00
d4b79179d9
Fixed width unit on graph, setted to px instead of %
...
Former-commit-id: 2517a1bfad9c609709f30025c2d6927c0011ade1
2019-03-01 14:58:41 +01:00
c5a5df01f6
add tip SLA Services
...
Former-commit-id: da452d98c0b3b43d36c4c53de70df762f6530c8d
2019-03-01 14:26:25 +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
02ff69ea0b
fixed errors SLA With planned downtime
...
Former-commit-id: 7350d33d917f967ea624e4763ed816af97c0743a
2019-03-01 12:34:34 +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
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
1d48e337fc
Merge branch 'ent-3497-event-responses-current-user-macro' into 'develop'
...
Recovered the lost code for the current user macro at the event responses.
See merge request artica/pandorafms!2231
Former-commit-id: 21bb62cba0d22beba25b6105e2a44651937cb003
2019-03-01 10:38:14 +01:00
42d8e72400
Recovered the lost code for the current user macro at the event responses.
...
(cherry picked from commit d554dcc7db
2019-03-01 09:40:36 +01:00
8fc432b934
Auto-updated build strings.
...
Former-commit-id: 818dfe6138fe1837c87d96d607b15e51e06336cb
2019-03-01 00:01:32 +01:00
7e53461b94
Added new alert when failed database
...
Former-commit-id: ee0e8efaf3f32b4c5a86d421873555969274ca43
2019-02-28 17:40:11 +01:00
fb40ef7ce4
Changed Maintainer in pandorafms-agent-unix
...
Former-commit-id: c0bff759d2926ec1459e66205b3918ec3d02d3f4
2019-02-28 17:12:31 +01:00
927ad30966
Merge branch 'ent-3594-Unificacion-de-tamaños-de-checkbox-switch' into 'develop'
...
Unified sizes of the checkbox switch
See merge request artica/pandorafms!2198
Former-commit-id: 9305bc60fd8b4815f6bbb2ece58dfcdd72e1ad70
2019-02-28 13:58:07 +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
cefaccb651
Fixed synchronize collections in node
...
Former-commit-id: d48015ff7c41298fa87cbb5cf1f298beac501719
2019-02-28 13:02:59 +01:00
95b5c4ad01
add new macro for alert events
...
Former-commit-id: 08c5bf0168bcd5d9c23a23443187870269d61a40
2019-02-28 12:30:01 +01:00
manuel
Daniel Rodriguez
marcos.alconada
daniel
artica
alejandro-campos
fermin
Tatiana Llorente
Alejandro Fraguas
Luis Calvo
fbsanchez
Alejandro Gallardo Escobar
samucarc
Daniel Maya