f69b86663a
Merge remote-tracking branch 'origin/ent-4226-mejoras-plugin-sap' into ent-EDF
...
Conflicts:
pandora_console/extras/mr/33.sql
pandora_console/godmode/wizards/Wizard.main.php
2019-11-14 21:40:35 +01:00
dcd9467bfb
fix symbols in gotty credentials
2019-11-14 21:10:46 +01:00
547e0c4364
Merge remote-tracking branch 'origin/ent-4772-omnishell' into ent-EDF
2019-11-14 20:58:16 +01:00
546b8dc448
omnishell minor changes
2019-11-14 20:55:55 +01:00
9dec1709c4
Fixed help content well printed
2019-11-14 19:10:31 +01:00
f348310675
ADD function to get SAP agents and sap view to sap agents
2019-11-14 19:01:23 +01:00
0d3817d64d
dynamic toggle in wizard input printForm
2019-11-14 17:45:45 +01:00
192fd10dd8
Merge remote-tracking branch 'origin/ent-EDF' into ent-4772-omnishell
2019-11-14 17:14:34 +01:00
3c87efe113
Merge remote-tracking branch 'origin/develop' into ent-EDF
...
Conflicts:
pandora_console/extras/mr/33.sql
2019-11-14 17:13:38 +01:00
7efb1367ef
Merge branch 'ent-EDF' into ent-4772-omnishell
2019-11-14 17:12:21 +01:00
14128590d6
Minor corrections&fixes
2019-11-14 17:05:01 +01:00
27bdf04735
Merge branch 'ent-4774-welcome-to-pandorafms' into 'develop'
...
first changed to welcome window
See merge request artica/pandorafms!2822
2019-11-14 16:05:22 +01:00
994b3a9bff
changes in service map widget: always show legend and fix visual problem
2019-11-14 15:21:24 +01:00
94d87c2a3c
Avoid welcome window on updates.
2019-11-14 14:14:50 +01:00
9a17a02d61
Fixed bug with line breaks in alert commands
2019-11-14 12:29:02 +01:00
c17acefc49
Merge remote-tracking branch 'origin/ent-EDF' into ent-4610-Alertas-de-logs
...
Conflicts:
pandora_console/extras/mr/33.sql
2019-11-14 12:22:11 +01:00
0199c6312a
Merge branch 'ent-4752-Herramientas-de-diagnostico' into 'develop'
...
refactoriced diagnostics pandoraFMS
See merge request artica/pandorafms!2809
2019-11-14 11:49:23 +01:00
a8b6f40ca1
change sap view menu position
2019-11-14 10:51:00 +01:00
750e6e789c
fixed minor error
2019-11-14 09:58:10 +01:00
879884e6c3
fixed errors
2019-11-14 09:52:56 +01:00
607c26529d
Fixed bug in visual console line item
2019-11-14 09:51:49 +01:00
86162b4c66
fixed errors
2019-11-14 08:53:45 +01:00
cfdb5330ae
Auto-updated build strings.
2019-11-14 00:01:12 +01:00
b0920d93af
Merge branch 'ent-4772-omnishell' into ent-EDF
...
Conflicts:
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
2019-11-13 18:15:19 +01:00
78443a029d
Omnishell rc1
2019-11-13 18:10:16 +01:00
42fc81a408
fixed errors
2019-11-13 17:50:22 +01:00
1729b3a2c0
Merge remote-tracking branch 'origin/ent-4769-modulos-ssh-php-perl' into ent-EDF
2019-11-13 17:43:01 +01:00
0e2a3d0f47
minor style fix after feedback cleanup
2019-11-13 17:42:14 +01:00
65d02d4529
Merge remote-tracking branch 'origin/ent-EDF' into ent-4774-welcome-to-pandorafms
2019-11-13 17:40:45 +01:00
345eb48fd7
save the green lines
2019-11-13 17:38:48 +01:00
83590146b1
Merge remote-tracking branch 'origin/develop' into ent-4774-welcome-to-pandorafms
2019-11-13 17:38:24 +01:00
8645b01828
fixed errors
2019-11-13 16:43:32 +01:00
670df456f5
wip results omnishell
2019-11-13 16:39:24 +01:00
a0db941b1e
fixed errors
2019-11-13 15:52:09 +01:00
62fbdd36a0
Solution for lost comments in the events section modal window
2019-11-13 15:36:52 +01:00
672ce6db22
first task omnishell and minor style checks
2019-11-13 15:24:44 +01:00
9b1a3a9cd1
Firts_task => first_task
2019-11-13 14:58:53 +01:00
6677b6a5ab
hide report in welcomewindow if not enterprise customer
2019-11-13 14:32:34 +01:00
f844c660af
Merge branch 'ent-4766-feedback-de-ayudas' into 'develop'
...
add feedback
See merge request artica/pandorafms!2813
2019-11-13 13:43:08 +01:00
19897c3894
Merge remote-tracking branch 'origin/ent-EDF' into ent-4769-modulos-ssh-php-perl
2019-11-13 13:34:35 +01:00
5f8ec8f89c
fixed errors
2019-11-13 13:29:09 +01:00
875d4430a7
Merge remote-tracking branch 'origin/ent-EDF' into ent-4772-omnishell
2019-11-13 12:21:42 +01:00
b11dbc639f
Merge remote-tracking branch 'origin/ent-4752-Herramientas-de-diagnostico' into ent-EDF
...
Conflicts:
pandora_console/general/header.php
2019-11-13 12:20:29 +01:00
f6b86042b2
Fixed bug in select for linked visual console
2019-11-13 12:19:09 +01:00
7103317bc2
Merge remote-tracking branch 'origin/develop' into ent-4752-Herramientas-de-diagnostico
...
Conflicts:
pandora_console/general/header.php
pandora_console/include/styles/pandora.css
2019-11-13 12:12:17 +01:00
28c9718c26
WIP alerts-log
2019-11-13 12:07:23 +01:00
fe45afa662
Merge remote-tracking branch 'origin/develop' into ent-4226-mejoras-plugin-sap
2019-11-13 12:01:36 +01:00
8c046ecdc6
fix bug when accessing certain views as home screen
2019-11-13 11:24:25 +01:00
d4c4b3c2d8
Merge branch 'ent-4664-Bug-Automatically-combined-graph' into 'develop'
...
Ent 4664 bug automatically combined graph
See merge request artica/pandorafms!2776
2019-11-13 10:01:19 +01:00
c19d760bdb
Auto-updated build strings.
2019-11-13 00:01:12 +01:00
e7dfd9b968
Add sap view
2019-11-12 19:53:46 +01:00
d1fbd36a97
WIP omnishell
2019-11-12 19:31:38 +01:00
25f879df00
add step 3
2019-11-12 18:45:20 +01:00
484ec9ea60
Ent 4845 revision de skins
2019-11-12 18:10:58 +01:00
2f0b646cd8
Merge branch 'ent-4463-Histórico-IP' into 'develop'
...
Fixed scroll in other ip addres in agent view - #4463
See merge request artica/pandorafms!2641
2019-11-12 18:10:16 +01:00
073ca73b2a
Merge branch 'ent-4670-Cambiar-tamaño-fuente-en-informes' into 'develop'
...
Added token in visual styles to change the font size in items of reports - #4670
See merge request artica/pandorafms!2798
2019-11-12 18:09:39 +01:00
f9215af803
Added tooltip to CSV datatable button
2019-11-12 17:33:58 +01:00
a11b18292c
Fixed width in the select to load filters in events view
2019-11-12 17:12:44 +01:00
fa6bc254a1
Fixed errors
2019-11-12 16:22:58 +01:00
50be60409e
Dont refresh the page when filter is changed in traps view
2019-11-12 15:58:36 +01:00
b9633933e1
Merge remote-tracking branch 'origin/develop' into ent-4774-welcome-to-pandorafms
...
Conflicts:
pandora_console/extras/mr/33.sql
pandora_console/general/header.php
2019-11-12 14:17:45 +01:00
0022408538
Merge remote-tracking branch 'origin/develop' into ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace
...
Conflicts:
pandora_console/extensions/quick_shell.php
2019-11-12 13:25:30 +01:00
1a7165f751
allow to remove user/pass from quick_shell configuration
2019-11-12 13:19:03 +01:00
02677849ce
add new css
2019-11-12 13:17:00 +01:00
9d3c9febad
Add alert correlation wizard
2019-11-12 13:16:25 +01:00
c652f758f4
Changed label agent version for agents with satellite os
2019-11-12 13:06:59 +01:00
7b06ceaafc
add sap menu
2019-11-12 10:54:36 +01:00
19d06dc061
Merge remote-tracking branch 'origin/ent-EDF' into ent-4226-mejoras-plugin-sap
2019-11-12 10:19:34 +01:00
ec05b52fb4
update omnishell.css
2019-11-12 10:08:35 +01:00
5ea93011d3
Changed title name or description in items table of reports
2019-11-12 09:53:10 +01:00
2ee4f9d88f
Auto-updated build strings.
2019-11-12 00:01:09 +01:00
1b3c7f8ed6
Fixed bug in some items of reports in metaconsole
2019-11-11 17:58:00 +01:00
a5a54e215d
fix extension agent_modules...
2019-11-11 16:42:54 +01:00
d1f9a86622
Merge branch 'ent-4774-welcome-to-pandorafms' into ent-EDF
2019-11-11 15:36:47 +01:00
01de54a220
other icon
2019-11-11 15:36:38 +01:00
1637b09b1e
Merge branch 'ent-4774-welcome-to-pandorafms' into ent-EDF
2019-11-11 15:23:35 +01:00
946ef2fae4
icon review tick badge
2019-11-11 15:23:23 +01:00
53954ec853
Merge branch 'ent-4774-welcome-to-pandorafms' into ent-EDF
2019-11-11 14:26:23 +01:00
65f5223698
validation alerts
2019-11-11 14:26:04 +01:00
0c5af7ea24
minor fixes
2019-11-11 13:46:42 +01:00
0b610cd8ba
Merge branch 'ent-4774-welcome-to-pandorafms' into ent-EDF
2019-11-11 13:39:08 +01:00
430af38fa6
minor fixes in flow control
2019-11-11 13:38:27 +01:00
f57f87b50b
Ent 4834 pandora custom logo text on conf
2019-11-11 13:33:37 +01:00
c390befc2a
Auto-updated build strings.
2019-11-11 00:01:07 +01:00
7e275febcd
Auto-updated build strings.
2019-11-10 00:01:07 +01:00
cba38680bd
Auto-updated build strings.
2019-11-09 00:01:09 +01:00
0213bc675e
add changes bbdd
2019-11-08 11:28:37 +01:00
deb2657353
Merge remote-tracking branch 'origin/ent-EDF' into ent-4610-Alertas-de-logs
2019-11-08 11:14:51 +01:00
ec2d46c299
Merge remote-tracking branch 'origin/ent-4752-Herramientas-de-diagnostico' into ent-EDF
2019-11-08 11:09:11 +01:00
ec72820c88
Icon adjustment
2019-11-08 11:08:43 +01:00
c8b39740a9
Auto-updated build strings.
2019-11-08 11:05:59 +01:00
fad8d88087
Merge branch 'ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace' into 'develop'
...
change execution permissions to pandora_websocket_engine rpm|deb files
See merge request artica/pandorafms!2870
2019-11-08 11:00:46 +01:00
6543756baf
change execution permissions to pandora_websocket_engine rpm|deb files
2019-11-08 09:49:09 +01:00
c78e3f4184
fixed minor error
2019-11-08 08:55:58 +01:00
d9d8cbfd35
Merge remote-tracking branch 'origin/ent-EDF' into ent-4772-omnishell
2019-11-07 19:43:18 +01:00
cf0a06f216
Merge branch 'ent-4766-feedback-de-ayudas' into ent-EDF
2019-11-07 19:41:36 +01:00
36ae77a33c
minor fix
2019-11-07 19:41:23 +01:00
a8bdb68cac
Merge branch 'ent-4766-feedback-de-ayudas' into ent-EDF
2019-11-07 19:40:23 +01:00
4905b18888
Fulfill help path and mail check
2019-11-07 19:39:50 +01:00
9387f59979
Merge branch 'ent-4766-feedback-de-ayudas' into ent-EDF
2019-11-07 18:39:06 +01:00
424aa10555
style minor changes
2019-11-07 18:38:52 +01:00
c4779f6f91
Merge branch 'ent-4766-feedback-de-ayudas' into ent-EDF
2019-11-07 18:33:51 +01:00
307eabc7b9
Merge remote-tracking branch 'origin/develop' into ent-EDF
2019-11-07 18:33:37 +01:00
cb131c7895
Some CDE and styling in help feedback
2019-11-07 18:33:03 +01:00
763ec6772c
Help feedback style improved
2019-11-07 17:26:32 +01:00
adc0f24f8e
Merge branch 'ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace' into 'develop'
...
Ent 3178 integrar terminal web en la consola de pandora y explorar otras utilidades anyterm replace
See merge request artica/pandorafms!2825
2019-11-07 15:48:12 +01:00
54c6f3965d
Fixed bug with doubles quotes in comments of events
2019-11-07 15:25:19 +01:00
778f49c100
Merge branch 'ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace' into ent-EDF
2019-11-07 14:20:44 +01:00
ab6e790b4e
minor-fix qs_admin interface
2019-11-07 14:20:29 +01:00
ef14de075e
Merge branch 'ent-4774-welcome-to-pandorafms' into ent-EDF
2019-11-07 14:06:07 +01:00
5fe515a3ed
Fixed welcome flow
2019-11-07 14:05:42 +01:00
664017aa38
same, null is overwritten by ws.php
2019-11-07 13:11:11 +01:00
f95ecb0f28
Allow empty configuration for gotty path
2019-11-07 13:00:38 +01:00
2fe5cb3d84
Merge branch 'ent-4937-Quitar-caja-de-Agent-info-si-no-hay-datos-en-ella' into 'develop'
...
Ent 4937 quitar caja de agent info si no hay datos en ella
See merge request artica/pandorafms!2868
2019-11-07 12:09:59 +01:00
a550f2d9d3
Merge branch 'ent-4403-8401-acanovas-ipam-creacion-de-superredes' into 'develop'
...
added function to convert cidr prefixes to mask
See merge request artica/pandorafms!2832
2019-11-07 11:47:24 +01:00
c49f94fdb5
Merge remote-tracking branch 'origin/ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace' into ent-EDF
2019-11-07 10:54:20 +01:00
f497312d29
minor fix. default values QS admin page
2019-11-07 10:54:05 +01:00
7c68595241
Merge remote-tracking branch 'origin/ent-4774-welcome-to-pandorafms' into ent-EDF
2019-11-07 10:43:24 +01:00
6e637954b8
Merge remote-tracking branch 'origin/develop' into ent-EDF
2019-11-07 10:43:15 +01:00
d080f1d6a7
Welcome pack
2019-11-07 10:42:46 +01:00
90912e2636
Hide agent info when only GIS data is displayed and it is empty
2019-11-07 09:52:06 +01:00
1006c54687
Merge branch 'ent-4928-Bug-generacion-PDF-con-set-initial-date' into 'develop'
...
Ent 4928 bug generacion pdf con set initial date
See merge request artica/pandorafms!2866
2019-11-07 09:48:42 +01:00
b18878148c
change load modal
2019-11-07 09:38:52 +01:00
79d165b164
Merge remote-tracking branch 'origin/develop' into ent-EDF
2019-11-06 20:01:28 +01:00
90d567a064
Merge branch 'develop' into 'ent-4664-Bug-Automatically-combined-graph'
...
Conflicts:
pandora_console/godmode/reporting/graphs.php
2019-11-06 17:48:51 +01:00
76d9ca9db5
Merge branch 'ent-4853-set-module-data-no-funciona-API' into 'develop'
...
Ent 4853 set module data no funciona api
See merge request artica/pandorafms!2841
2019-11-06 17:19:51 +01:00
e81932cf0d
Merge branch 'ent-4809-Seleccion-de-tamaño-de-fuente-en-Agent-detail' into 'develop'
...
Fixed visual styles ticket 4809
See merge request artica/pandorafms!2867
2019-11-06 16:23:51 +01:00
0647b156a5
Merge branch 'ent-4904-8870-No-se-puede-ver-usuarios-sin-permisos-AR' into 'develop'
...
fix bug in user list permission checks
See merge request artica/pandorafms!2865
2019-11-06 16:06:49 +01:00
ddd370f7c5
Merge remote-tracking branch 'origin/ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace' into ent-EDF
2019-11-06 15:37:45 +01:00
98237a8d34
Merge remote-tracking branch 'origin/develop' into ent-EDF
...
Conflicts:
pandora_console/general/header.php
2019-11-06 15:36:53 +01:00
34bfb762fd
Merge branch 'ent-4857-Bug-color-pagina-eventos' into 'develop'
...
Ent 4857 bug color pagina eventos
See merge request artica/pandorafms!2834
2019-11-06 15:27:48 +01:00
137571f2d1
Merge branch 'ent-4856-8969-Filtro-user-ack-evento-no-funciona-del-todo-bien' into 'develop'
...
user ack filter in event list not displaying users with all group
See merge request artica/pandorafms!2860
2019-11-06 14:45:09 +01:00
d460429509
Merge branch 'ent-4898-No-funciona-filtro-de-eventos-cuando-el-idioma-del-usuario-está-en-catalán' into 'develop'
...
Fixed agent name and error lenght
See merge request artica/pandorafms!2845
2019-11-06 13:14:06 +01:00
e9b516c399
change access permission to users in user ack filter in event list
2019-11-06 12:56:42 +01:00
37ffff12eb
Merge branch '4727-macros-grupos-secundarios' into 'develop'
...
4727 macros grupos secundarios
See merge request artica/pandorafms!2811
2019-11-06 12:20:39 +01:00
5a34ec51d2
Merge branch 'ent-4687-api-get-all-agents-recursion' into 'develop'
...
Added recursion to api_get_all_agents
See merge request artica/pandorafms!2753
2019-11-06 10:38:17 +01:00
1a34e488b6
Fixed bug in report date in pdf reports
2019-11-06 10:34:08 +01:00
a486738920
Fixed visual styles ticket 4809
2019-11-06 10:31:26 +01:00
05e424a24e
Merge remote-tracking branch 'origin/develop' into ent-4623-Exportar-a-CSV-los-eventos-separador-erroneo
...
Conflicts:
pandora_console/include/functions_ui.php
2019-11-05 17:25:56 +01:00
87c5d0025b
Merge remote-tracking branch 'origin/develop' into ent-4623-Exportar-a-CSV-los-eventos-separador-erroneo
2019-11-05 17:24:10 +01:00
35d87400fd
Merge branch 'ent-4892-HTML-custom-report-date-vacio' into 'develop'
...
Ent 4892 html custom report date vacio
See merge request artica/pandorafms!2847
2019-11-05 17:19:40 +01:00
4b9d6f1ae2
fix bug in user list permission checks
2019-11-05 17:18:38 +01:00
b707ebd4a4
Added docs and support urls in console. Fixed bugs
2019-11-05 17:09:29 +01:00
b7d8323583
Merge branch 'ent-3687-get-agents-id-name-by-alias-api-cli' into 'develop'
...
Added API and cli function get_agents_id_by_alias
See merge request artica/pandorafms!2802
2019-11-05 17:08:32 +01:00
0f2d30698c
Merge branch 'ent-4872-Cambiar-titulo-a-archivo-XML-de-los-templates-de-reports' into 'develop'
...
Ent 4872 cambiar titulo a archivo xml de los templates de reports
See merge request artica/pandorafms!2862
2019-11-05 17:03:53 +01:00
0e628a365d
Merge branch 'ent-4625-Cambiar-titulo-a-archivo-CSV-de-la-vista-de-eventos' into 'develop'
...
Ent 4625 cambiar titulo a archivo csv de la vista de eventos
See merge request artica/pandorafms!2783
2019-11-05 16:57:23 +01:00
dd86598298
Merge branch 'ent-4902-Querys-predefinidas-en-plantillas-de-informes-no-funcionan' into 'develop'
...
Fixed visual bug in general report item
See merge request artica/pandorafms!2854
2019-11-05 16:43:52 +01:00
b80cb976f9
review fms
2019-11-05 16:08:51 +01:00
c68a5b57dd
fixed Change bbdd
2019-11-05 16:04:48 +01:00
f4f618c1da
Merge remote-tracking branch 'origin/ent-EDF' into ent-4769-modulos-ssh-php-perl
2019-11-05 15:40:14 +01:00
276fc82556
Merge branch 'ent-EDF' into ent-4226-mejoras-plugin-sap
...
Conflicts:
pandora_console/extras/mr/33.sql
2019-11-05 15:39:18 +01:00
e5f24ca884
Merge develop
2019-11-05 15:27:06 +01:00
ed6dd2983f
Merge remote-tracking branch 'origin/ent-4752-Herramientas-de-diagnostico' into ent-EDF
...
Conflicts:
pandora_console/include/javascript/pandora.js
2019-11-05 15:21:21 +01:00
58cbc3c738
Merge remote-tracking branch 'origin/develop' into ent-EDF
...
Conflicts:
pandora_console/extras/mr/33.sql
pandora_console/pandoradb_data.sql
2019-11-05 15:17:09 +01:00
ebb7cbfe6c
Fix styles css
2019-11-05 15:12:24 +01:00
b40f0012db
fix bug in meta visual console: group item not retrieving values properly
2019-11-05 14:34:43 +01:00
01ba485401
Merge branch 'ent-4859-8959-SNMP-console-filter-warning-critical-critical-normal' into 'develop'
...
fix bug in snmp console filter
See merge request artica/pandorafms!2844
2019-11-05 14:01:35 +01:00
dab4676a33
Resolved merge conflict and fixed bugs
2019-11-05 13:57:13 +01:00
98d36cfc6d
Merge branch 'ent-4896-General-Report-en-Plantillas-no-tiene-bien-la-hora' into 'develop'
...
Ent 4896 general report en plantillas no tiene bien la hora
See merge request artica/pandorafms!2855
2019-11-05 13:33:27 +01:00
945383b8ec
Changed name of xml report
2019-11-05 12:43:08 +01:00
dc565d2575
pandora_websocket_engine installation in RPM/DEB packages
2019-11-05 12:01:58 +01:00
e583b71a99
missaligned tips
2019-11-05 11:51:26 +01:00
32f4ad2c4f
Changed name of variable filter in menu
2019-11-05 11:20:57 +01:00
b1d4bfe149
Merge remote-tracking branch 'origin/develop' into ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace
...
Conflicts:
pandora_console/pandoradb_data.sql
2019-11-05 11:16:26 +01:00
9fc635a7a9
user ack filter in event list not displaying users with all group
2019-11-05 11:03:28 +01:00
ec3c7ba559
Some remote command examples
2019-11-04 20:36:03 +01:00
27038cb0a3
Merge branch 'ent-EDF' into ent-4226-mejoras-plugin-sap
2019-11-04 20:10:19 +01:00
a1b879d065
Merge branch 'ent-4728-Desactivar-Restart-Map-para-usuarios-sin-permisos' into 'develop'
...
Ent 4728 desactivar restart map para usuarios sin permisos
See merge request artica/pandorafms!2805
2019-11-04 18:45:57 +01:00
c83b85c225
Ent 4801 error informes pdf csv
2019-11-04 18:41:03 +01:00
7c73d5f51a
Added confirmation to delete a visual console
2019-11-04 17:56:28 +01:00
777bbdd180
Merge branch '4581-sample-agent-nueva-funcionalidad' into 'develop'
...
Added feature sample_agent
See merge request artica/pandorafms!2826
2019-11-04 17:54:33 +01:00
f584ac7835
Solved issue with query
2019-11-04 17:45:56 +01:00
84bdc8fc17
add progress extend
2019-11-04 17:39:21 +01:00
e94d8726c7
Changed date in webchat
2019-11-04 13:59:30 +01:00
648778fffe
Merge branch 'ent-4810-No-funcionan-los-templates-de-consolas-visuales' into 'develop'
...
Ent 4810 no funcionan los templates de consolas visuales
See merge request artica/pandorafms!2814
2019-11-04 12:40:04 +01:00
28e2702a48
Changed condition for general reports with last value checked
2019-11-04 12:00:12 +01:00
123cf6e4a0
Merge branch 'ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace' into ent-EDF
2019-11-04 11:25:22 +01:00
cf3bcefddf
Merge branch 'ent-4826-error-accesso-con-sin-acl' into 'develop'
...
Fixed planned downtime acl
See merge request artica/pandorafms!2829
2019-11-04 11:25:17 +01:00
a7e3614fa6
renamed ws service
2019-11-04 11:23:31 +01:00
d0c2c0d1eb
Fixed visual bug in general report item
2019-11-04 10:39:16 +01:00
a249132fb5
sap discovery - config
2019-10-31 21:32:34 +01:00
aa30a12f31
wizard doc minor fix
2019-10-31 21:15:18 +01:00
115c884cd4
Discovery SAP
2019-10-31 21:13:18 +01:00
5a42e76650
SAP discovery task
2019-10-31 18:19:00 +01:00
c72f792d43
SAP discovery task
2019-10-31 18:18:38 +01:00
867ab6d0bf
Fixed bug in report date
2019-10-31 09:51:38 +01:00
102ed552bd
Merge branch 'ent-4772-omnishell' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4772-omnishell
2019-10-31 09:36:18 +01:00
3eb0a6bb95
minor fixes after internal meeting
2019-10-30 18:33:33 +01:00
72b1fb2b16
Merge remote-tracking branch 'origin/ent-4774-welcome-to-pandorafms' into ent-EDF
...
Conflicts:
pandora_console/include/javascript/pandora.js
modified: pandora_console/general/register.php
modified: pandora_console/godmode/agentes/configurar_agente.php
modified: pandora_console/godmode/agentes/module_manager_editor.php
new file: pandora_console/include/ajax/welcome_window.php
new file: pandora_console/include/class/WelcomeWindow.class.php
modified: pandora_console/include/constants.php
modified: pandora_console/include/functions_config.php
modified: pandora_console/include/javascript/pandora.js
new file: pandora_console/include/styles/new_installation_welcome_window.css
2019-10-30 16:56:44 +01:00
7bfa076263
fixed error bbdd
2019-10-30 14:52:10 +01:00
7a937aeb3a
Merge branch 'ent-4772-omnishell' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4772-omnishell
2019-10-30 14:47:36 +01:00
334cea472e
add method ui_progress_extend(work in progress)
2019-10-30 14:47:28 +01:00
d37410ed8c
fixed error bbdd
2019-10-30 14:43:10 +01:00
8573add0b3
Fixed agent name and error lenght
2019-10-30 13:01:59 +01:00
26f40bbeec
Merge branch 'ent-4772-omnishell' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4772-omnishell
2019-10-30 10:01:58 +01:00
b7710a6562
fix remove mr34 to mr33
2019-10-30 08:04:13 +01:00
bb7ba67dab
changes in omnishell.css
2019-10-29 17:49:04 +01:00
2bb81a839a
Merge remote-tracking branch 'origin/ent-EDF' into ent-4772-omnishell
...
Conflicts:
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/godmode/menu.php
pandora_console/pandoradb_data.sql
2019-10-29 17:15:19 +01:00
c07baa614f
Merge remote-tracking branch 'origin/ent-4766-feedback-de-ayudas' into ent-EDF
2019-10-29 17:00:57 +01:00
613e5741fb
Merge branch 'develop' into 'ent-4766-feedback-de-ayudas'
...
# Conflicts:
# pandora_console/include/functions_ui.php
2019-10-29 17:00:39 +01:00
487da50d31
add omnishell.css
2019-10-29 16:56:11 +01:00
383967f68a
Merge branch 'ent-4769-modulos-ssh-php-perl' into ent-EDF
2019-10-29 16:56:01 +01:00
0a53c0b915
Merge remote-tracking branch 'origin/ent-4752-Herramientas-de-diagnostico' into ent-EDF
2019-10-29 16:50:46 +01:00
7224131126
Merge branch 'ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace' into ent-EDF
2019-10-29 16:50:02 +01:00
14230d218a
fix bug in snmp console filter
2019-10-29 16:14:33 +01:00
f3fdcb4de0
MR update
2019-10-29 16:06:34 +01:00
6478c7a51f
minor tips quickshell
2019-10-29 15:55:39 +01:00
06c7544041
minor fixes
2019-10-29 15:44:46 +01:00
cf0321846f
fix bug in dynamic report filter group functionality: not applying recursion correctly
2019-10-29 12:31:23 +01:00
8174b4f2eb
add help option in welcome window
2019-10-29 10:38:22 +01:00
64e80e6fee
Fixed error message
2019-10-29 10:32:59 +01:00
7f01f3d014
Merge remote-tracking branch 'origin/develop' into ent-3687-get-agents-id-name-by-alias-api-cli
2019-10-29 10:23:46 +01:00
6ff85d2abb
fixed image
2019-10-29 09:21:08 +01:00
758804e5de
fix minor bug in function groups_get_id_recursive
2019-10-29 09:18:21 +01:00
6f52095419
Merge remote-tracking branch 'origin/develop' into ent-4752-Herramientas-de-diagnostico
2019-10-29 09:14:06 +01:00
f6fd5cc21f
Add image feedback
2019-10-29 09:13:48 +01:00
6f3e42e732
Auto-updated build strings.
2019-10-29 00:01:13 +01:00
57bfc364ae
add modal confirmation window
2019-10-28 18:57:10 +01:00
6d21f71617
removed trace
2019-10-28 18:38:56 +01:00
7d5b845e1f
minor fixes
2019-10-28 18:37:01 +01:00
32da1d287b
Fixed API function set_module_data
2019-10-28 15:19:39 +01:00
049c3c2476
fix migrate missing content
2019-10-28 13:46:37 +01:00
e12bcb2ac4
Merge remote-tracking branch 'origin/develop' into ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace
2019-10-28 12:59:02 +01:00
7accbc97c4
Merge remote-tracking branch 'origin/develop' into ent-4769-modulos-ssh-php-perl
2019-10-28 12:36:19 +01:00
3094d5af05
Updated version and build strings.
2019-10-28 12:35:59 +01:00
9becb90180
Merge remote-tracking branch 'origin/develop' into ent-4772-omnishell
2019-10-28 12:23:12 +01:00
3056c6741a
changes bbdd mr34
2019-10-28 12:20:55 +01:00
74007ebf70
33 => 34, cleanup
2019-10-28 12:18:56 +01:00
ccf971c2eb
Merge remote-tracking branch 'origin/develop' into ent-4769-modulos-ssh-php-perl
2019-10-28 12:18:19 +01:00
d6681cedd1
33 => 34
2019-10-28 12:18:13 +01:00
ffb9b9052c
Merge branch 'ent-4848-phantomjs-se-queda-congelado' into 'develop'
...
Ent 4848 phantomjs se queda congelado
See merge request artica/pandorafms!2837
2019-10-28 11:53:47 +01:00
08247c1952
Merge branch 'ent-3779-7612-Revision-de-llamadas-a-api-y-cli-agent-name-alias-name' into 'develop'
...
changed pandora api functions to include possibility of using agent alias when...
See merge request artica/pandorafms!2819
2019-10-28 11:25:38 +01:00
b54ece2b70
Add menu omnishell
2019-10-28 10:46:25 +01:00
b16ef248d6
minor fixes in cli and api functions
2019-10-28 09:48:52 +01:00
89b030c484
Merge remote-tracking branch 'origin/develop' into ent-4752-Herramientas-de-diagnostico
2019-10-28 08:50:02 +01:00
88a56a1f22
Auto-updated build strings.
2019-10-28 00:01:08 +01:00
874ac0c630
Auto-updated build strings.
2019-10-27 00:01:07 +02:00
8a03486dfc
Auto-updated build strings.
2019-10-26 00:01:09 +02:00
f8c9b83a9c
Merge remote-tracking branch 'origin/develop' into ent-4752-Herramientas-de-diagnostico
2019-10-25 13:46:08 +02:00
c4aea1ac59
add styles validation form of modal
2019-10-25 13:28:01 +02:00
21dd69706d
web2image
2019-10-25 13:16:06 +02:00
440874d436
More controls for phantom web2image
2019-10-25 12:51:33 +02:00
a2e96270a7
Avoid close cron sessions while gc
2019-10-25 12:24:02 +02:00
2a24e22335
Avoid close cron sessions while gc
2019-10-25 12:23:00 +02:00
22a2b7cd0b
Add feedback phpInfo
2019-10-25 10:43:03 +02:00
86fd1275be
Auto-updated build strings.
2019-10-25 00:01:11 +02:00
3dee6888d6
fix
2019-10-24 17:42:37 +02:00
38b3490e4e
Changed color of constant to severity minor in events
2019-10-24 17:42:27 +02:00
c4c7d916e7
Applying of better way for save config
2019-10-24 17:21:21 +02:00
e725a0185b
cambios semi finales
2019-10-24 16:56:13 +02:00
b0db7c729d
Solved minor issues
2019-10-24 16:23:58 +02:00
742329336e
Added link with visual consoles
2019-10-24 14:30:34 +02:00
ee587a3117
Merge remote-tracking branch 'origin/develop' into ent-3779-7612-Revision-de-llamadas-a-api-y-cli-agent-name-alias-name
2019-10-24 13:21:08 +02:00
a4988fe9af
modified get_events functions in functions_api
2019-10-24 13:18:26 +02:00
a0c610d988
WS fixed audit origin address
2019-10-24 12:18:49 +02:00
045d42d2bb
quickShell auth
2019-10-24 12:05:00 +02:00
29bcd379f7
Added changes for liking with visual consoles
2019-10-24 11:53:35 +02:00
276879d8ee
clean cmd ws code style
2019-10-24 11:06:03 +02:00
32cb12ca03
gotty refresh on ws restart
2019-10-24 11:04:38 +02:00
df576a3b86
ws gotty credentials and ws gotty proxy redirection
2019-10-24 10:59:08 +02:00
d34aa0917b
WS tick interval, WS manager able to limit connections per session
2019-10-24 10:35:16 +02:00
38dfa5cf35
Auto-updated build strings.
2019-10-24 00:01:09 +02:00
709f4cac81
WebSocket configuration, quickShell settings, quickShell proxied url compatibility
2019-10-23 19:56:48 +02:00
de22fb70e3
Merge remote-tracking branch 'origin/develop' into ent-4752-Herramientas-de-diagnostico
2019-10-23 19:51:49 +02:00
f06a55c6bb
continue feedback mail
2019-10-23 19:50:57 +02:00
0d67d23cb6
quickShell support for ws_proxy_url
2019-10-23 19:19:38 +02:00
a06f56a413
added function to convert cidr prefixes to mask
2019-10-23 17:22:18 +02:00
5364ef0fa1
Merge branch 'ent-4745-8826-cofares-han-dejado-de-llegar-las-graficas-que-nos-llegaban-en-los-correos-de-alerta-por-mail' into 'develop'
...
Fix and control API sessions
See merge request artica/pandorafms!2830
2019-10-23 16:12:19 +02:00
31c36dc015
Ent 4819 no funciona llamada api get events
2019-10-23 15:53:30 +02:00
5cf7a0026e
minor changes and init.d script for websocket engine
2019-10-23 15:23:35 +02:00
66ceb93d04
minor changes and init.d script for websocket engine
2019-10-23 15:23:21 +02:00
8fd6f28070
Merge branch 'ent-4851-Cambio-de-color-en-la-union-de-agentes-del-GIS-map' into 'develop'
...
Changed color
See merge request artica/pandorafms!2831
2019-10-23 12:28:04 +02:00
39b3a00276
Merge branch 'ent-4690-revision-completa-de-informes-templates-en-meta' into 'develop'
...
Fixed bugs in reports
See merge request artica/pandorafms!2796
2019-10-23 11:41:07 +02:00
c01a856826
Changed color
2019-10-23 11:17:16 +02:00
1470241783
Auto-updated build strings.
2019-10-23 00:01:11 +02:00
9edb77d288
proper logout (api)
2019-10-22 20:48:45 +02:00
5b3fd5dd79
Merge remote-tracking branch 'origin/develop' into ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace
2019-10-22 17:34:41 +02:00
eb98f695f9
Merge branch 'ent-4745-8826-cofares-han-dejado-de-llegar-las-graficas-que-nos-llegaban-en-los-correos-de-alerta-por-mail' into ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace
2019-10-22 17:34:34 +02:00
ccfd944ad7
Fix and control API sessions
...
Conflicts:
pandora_console/include/lib/User.php
modified: pandora_console/include/api.php
modified: pandora_console/include/chart_generator.php
new file: pandora_console/include/lib/User.php
modified: pandora_console/include/load_session.php
modified: pandora_console/include/web2image.js
2019-10-22 17:33:50 +02:00
b35c9dd96d
ajust changes
2019-10-22 16:42:13 +02:00
33d26144f1
Fixed planned downtime acl
2019-10-22 16:00:01 +02:00
bbeb750e46
Merge branch 'develop' into ent-4690-revision-completa-de-informes-templates-en-meta
...
Conflicts:
pandora_console/include/functions_graph.php
2019-10-22 15:51:38 +02:00
deb217906c
Fixed bug in templates
2019-10-22 15:41:13 +02:00
f234e0c4a3
Merge branch 'ent-4836-menu-duplicado-en-reports-de-metaconsola' into 'develop'
...
fixed visual error metaconsole
See merge request artica/pandorafms!2828
2019-10-22 14:23:20 +02:00
552d8758e8
Merge branch 'ent-4815-html-en-los-csv' into 'develop'
...
Fixed bug in CSV export
See merge request artica/pandorafms!2824
2019-10-22 14:22:42 +02:00
6963ce894b
Merge branch 'develop' into 'ent-4836-menu-duplicado-en-reports-de-metaconsola'
...
# Conflicts:
# pandora_console/godmode/reporting/reporting_builder.php
2019-10-22 13:26:15 +02:00
70978f838c
fixed visual error metaconsole
2019-10-22 13:22:13 +02:00
f14c4966e3
changes
2019-10-22 13:10:15 +02:00
0cf3e01f74
Merge branch 'ent-1880-Umbrales-inversos-en-negativo' into 'develop'
...
Ent 1880 umbrales inversos en negativo
See merge request artica/pandorafms!2818
2019-10-22 12:56:21 +02:00
ee0eee06f6
Merge branch 'ent-4724-estilo-vista-pandora-wux' into 'develop'
...
fixed visual error
See merge request artica/pandorafms!2779
2019-10-22 12:54:28 +02:00
ca49cefb0d
fixed
2019-10-22 12:19:25 +02:00
79a1a1b2a3
add wux.css
2019-10-22 10:23:53 +02:00
f99616723b
Auto-updated build strings.
2019-10-22 00:01:09 +02:00
c963681098
Quick shell telnet improvements
2019-10-21 21:10:26 +02:00
47e6f4adb5
Fix and control API sessions
2019-10-21 21:09:03 +02:00
ee97ed8a5e
segunda ronda
2019-10-21 18:36:02 +02:00
e37af1598a
continue feedback diagnostics
2019-10-21 18:11:04 +02:00
9d8bb880fa
Modular WebSocket engine, added ssh and telnet to quickshell extension
2019-10-21 17:36:50 +02:00
6c52462c8c
Modular WebSocket engine, added ssh and telnet to quickshell extension
2019-10-21 17:36:26 +02:00
bb2faca479
ma
2019-10-21 12:18:42 +02:00
312b1c7c40
Fixed bug in CSV export
2019-10-21 11:48:13 +02:00
2884226e56
Merge branch 'ent-4369-Graficas-en-meta-mobile-sin-TIP' into 'develop'
...
Ent 4369 graficas en meta mobile sin tip
See merge request artica/pandorafms!2780
2019-10-21 11:03:53 +02:00
547607c21e
Merge branch 'ent-4794-Permiso-Manage-Users-no-funciona' into 'develop'
...
Ent 4794 permiso manage users no funciona
See merge request artica/pandorafms!2804
2019-10-21 10:48:36 +02:00
f2dbcea183
fix indentation
2019-10-21 09:55:39 +02:00
6cf08dde1e
Merge branch 'develop' into ent-3779-7612-Revision-de-llamadas-a-api-y-cli-agent-name-alias-name
2019-10-21 09:43:43 +02:00
f72fde0fb5
Auto-updated build strings.
2019-10-21 00:01:07 +02:00
bb9d18b6d8
Auto-updated build strings.
2019-10-20 00:01:07 +02:00
88248fd226
Auto-updated build strings.
2019-10-19 00:01:11 +02:00
1cf77cc8f1
WSProxy ACL check
2019-10-18 18:55:29 +02:00
b8d03e98c3
pdf diagnostic
2019-10-18 15:23:23 +02:00
4638915c70
Fixed minor bugs
2019-10-18 12:48:38 +02:00
85dff93f41
Added strict option
2019-10-18 12:22:20 +02:00
13898da4c1
Merge branch 'ent-4733-no-funciona-buscador-general-de-politicas' into 'develop'
...
fixed minor error
See merge request artica/pandorafms!2777
2019-10-18 11:42:30 +02:00
353246f9f6
first changed to welcome window
2019-10-18 10:30:19 +02:00
22af1a3654
Auto-updated build strings.
2019-10-18 00:01:11 +02:00
e24024d2f4
WS gotty extension - global
2019-10-17 15:31:17 +02:00
4e56f6751a
Continue work diagnostics
2019-10-17 15:17:28 +02:00
e5890b038d
Merge branch 'ent-4069-Graphs-containers-in-Custom-graphs-error' into 'develop'
...
Ent 4069 graphs containers in custom graphs error
See merge request artica/pandorafms!2787
2019-10-17 14:20:06 +02:00
be29f1dd55
Merge branch 'ent-4746-boton-de-aspecto-raro-en-forgot-your-password' into 'develop'
...
fixed minor error
See merge request artica/pandorafms!2782
2019-10-17 13:20:14 +02:00
adf3b08537
Add text (inv) in the help of the thresholds for inverse intervals - #1880
2019-10-17 11:50:50 +02:00
3a5bbb22bd
changed pandora api functions to include possibility of using agent alias when agent id is accepted as argument
2019-10-17 11:14:42 +02:00
2dfc2b7a8a
Merge branch 'ent-3989-graficas-sql-metaconsola' into 'develop'
...
Available in metaconsole sql charts in reports for metaconsole server
See merge request artica/pandorafms!2697
2019-10-17 11:07:37 +02:00
3cb80e5d32
Merge branch '4820-planned_downtimes_created-no-se-almacena-correctamente' into 'develop'
...
Solved issue with date_from and dato_to missing time data
See merge request artica/pandorafms!2817
2019-10-17 10:16:07 +02:00
e80ef83d66
Merge branch 'ent-4692-vodat-al-editar-un-item-de-un-custom-report-devuelve-la-pantalla-de-item-editor' into 'develop'
...
When an item is updated, it is redirected to the item lists
See merge request artica/pandorafms!2755
2019-10-17 10:13:40 +02:00
5264de2008
Merge branch 'develop' into 'ent-4720-Redireccion-erronea-de-Meta-a-Nodo-desde-Eventos'
...
Conflicts:
pandora_console/operation/events/events.php
2019-10-17 09:27:00 +02:00
361f2022f4
Auto-updated build strings.
2019-10-17 00:01:10 +02:00
b6db2aa041
Merge branch 'ent-4684-migracion-de-mapas-open-y-enterprise-de-v6-a-v7' into 'develop'
...
Fixed open and enterprise network map migration
See merge request artica/pandorafms!2745
2019-10-16 19:03:24 +02:00
4a29057a1b
Solved issue with date_from and dato_to missing time data
2019-10-16 16:41:22 +02:00
039d854441
Merge branch 'ent-4784-Selector-de-intervalo-en-bulks-pule-el-conf-de-los-agentes-con-remote-dependiendo-de-la-opción-que-seleccionemos' into 'develop'
...
Ent 4784 selector de intervalo en bulks pule el conf de los agentes con remote dependiendo de la opción que seleccionemos
See merge request artica/pandorafms!2800
2019-10-16 14:16:13 +02:00
5f0dffb816
Merge branch 'ent-4559-desajuste-en-custom-fields' into 'develop'
...
Ent 4559 desajuste en custom fields
See merge request artica/pandorafms!2684
2019-10-16 11:38:38 +02:00
e7a948bb71
Update HelpFeedBack.class.php
2019-10-16 11:03:21 +02:00
7e54a26b49
Merge branch 'ent-4618-8580-4526-Bug-en-los-CSV-report' into 'develop'
...
Fixed csv reports download
See merge request artica/pandorafms!2742
2019-10-16 09:58:00 +02:00
a3a456da92
Auto-updated build strings.
2019-10-16 00:01:08 +02:00
4cceb38762
1st RC WebSocketProxy
2019-10-15 22:16:54 +02:00
1a77e3e381
Update HelpFeedBack.class.php
2019-10-15 18:11:50 +02:00
43d3f32d0c
Update help_feedback.css
2019-10-15 18:11:21 +02:00
5a73b67545
Update help_feedback.css
2019-10-15 17:59:22 +02:00
06f8f920b8
wip WS redirection
2019-10-15 17:20:23 +02:00
30caad5a6c
Added column cache_expiration in tlayout_template_data in MR, migrate, and pandoradb.sql - #4810
2019-10-15 16:50:05 +02:00
d04544fa66
Update HelpFeedBack.class.php
2019-10-15 16:34:01 +02:00
03ada6fb1f
Update HelpFeedBack.class.php
2019-10-15 16:28:12 +02:00
8999f408ef
redirect to list items when update item
2019-10-15 14:13:07 +02:00
ca5a31db6a
Merge branch 'ent-3830-autorrefresh-en-mapas-gis' into 'develop'
...
add gis maps to autorefresh list
See merge request artica/pandorafms!2731
2019-10-15 13:21:19 +02:00
f8636e77cc
Update HelpFeedBack.class.php
2019-10-15 12:45:40 +02:00
a31e66a9bd
add feedback
2019-10-15 12:16:50 +02:00
78610b127c
Merge branch 'ent-4682-Comentarios-en-eventos-no-se-ven-en-metaconsola' into 'develop'
...
Ent 4682 comentarios en eventos no se ven en metaconsola
See merge request artica/pandorafms!2775
2019-10-15 11:42:00 +02:00
89843fcc3b
Update functions_ui
2019-10-15 11:13:40 +02:00
6c21d57677
Auto-updated build strings.
2019-10-15 00:01:09 +02:00
3a9e5fa477
wip: gotty redirection experiment p2
2019-10-14 19:33:00 +02:00
13a72426cd
fixed diagnostics
2019-10-14 17:21:38 +02:00
fbsanchez
marcos
Alejandro Fraguas
alejandro-campos
Tatiana Llorente
Daniel Barbero Martin
manuel
artica
Jose Gonzalez
Daniel Rodriguez
Luis Calvo
Daniel Maya
artica