tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
27,024 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

5647 Commits

Author SHA1 Message Date
Daniel Rodriguez 48b299ba67 Merge branch 'ent-7228-Errores-en-las-Visual-consoles-de-Metaconsola' into 'develop' 
fixed minor error

See merge request artica/pandorafms!3967
 2021-03-26 13:05:28 +00:00
fbsanchez a3e571ff50 Merge remote-tracking branch 'origin/develop' into ent-3059-revision-de-la-funcion-metaconsole_connect 
Conflicts:
	pandora_console/godmode/users/user_list.php
 2021-03-26 13:52:01 +01:00
Daniel Rodriguez dff3ef3484 Merge branch 'ent-7223-error-message-update-manager-offline' into 'develop' 
Restored not update error message on update manager offline

See merge request artica/pandorafms!3965
 2021-03-26 12:35:57 +00:00
Daniel Barbero Martin 487a9b96d9 fixed minor error 2021-03-26 13:25:42 +01:00
Calvo 887742a675 Restored not update error message on update manager offline 2021-03-26 13:02:55 +01:00
Calvo 2c86e3e26c Substituted eye with operation (magnifier) icon on credential store and tasklist 2021-03-26 12:20:37 +01:00
Marcos Alconada 3d350ba481 fixed visual error 2021-03-26 09:32:30 +00:00
Junichi Satoh d4b8916c54 Fixed following problems. 
- alert actions cannot be copied/removed by any users
- alert actions cannot be modified by users with 'LM' even if alerts belong to the same group of users.

And users with 'LM' can now copy alert actions/templates in All group to the group to which the user belongs.
 2021-03-26 17:11:10 +09:00
Daniel Rodriguez 6413f6d551 Merge branch 'ent-4755-base-de-datos-historico-revision' into 'develop' 
DBMainainer, fixed Websockets library placement

See merge request artica/pandorafms!3797
 2021-03-25 14:33:31 +00:00
Daniel Rodriguez 29e7e3c844 Merge branch 'ent-7196-tabla-de-list-sla-no-se-muestra' into 'develop' 
fixed visual error

See merge request artica/pandorafms!3946
 2021-03-25 11:55:33 +00:00
marcos 823bf52372 fixed visual error 2021-03-25 11:49:32 +01:00
fbsanchez fdc4133eaa Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 2021-03-25 10:20:02 +01:00
Daniel Maya 79914082e9 Ent 6850 quitar nta 2021-03-24 15:16:13 +00:00
fbsanchez 9c693e309c AWS.S3 monitoring RC1 2021-03-24 11:52:47 +01:00
marcos 90c825888a fixed visual error 2021-03-23 15:12:57 +01:00
fbsanchez 659c1b4503 Wizard Aws.S3 RC1 2021-03-22 19:21:05 +01:00
fbsanchez e0aa1bfc68 Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
	pandora_console/include/styles/pandora.css
 2021-03-22 09:59:07 +01:00
Daniel Rodriguez da4c5a1c28 Merge branch 'ent-7167-meta-varios-botones-y-ventanas-descuadradas' into 'develop' 
fixed visual errors

See merge request artica/pandorafms!3925
 2021-03-18 17:05:50 +00:00
Marcos Alconada 04bae1b4fb fixed visual errors 2021-03-18 17:05:50 +00:00
Daniel Rodriguez 8eb06d8adc Merge branch 'ent-6753-consistencia-en-el-selector-de-grupos' into 'develop' 
group selector updates for report, required

See merge request artica/pandorafms!3763
 2021-03-18 16:05:16 +00:00
Daniel Maya 6a9dff3355 Ent 6852 integrar edicion de sistema de credencial boxes con edicion de coniguracion del satelite en la misma vista 2021-03-18 16:00:14 +00:00
Daniel Rodriguez 9c4a6a56c7 Merge branch 'ent-5331-implementar-monitorizacion-de-ms-SQL-Server-en-discovery-como-el-de-oracle' into 'develop' 
add discovery_app_microsoft_sql_serve on task list

See merge request artica/pandorafms!3058
 2021-03-18 09:56:31 +00:00
fbsanchez a3069fdf76 Merge remote-tracking branch 'origin/develop' into ent-6753-consistencia-en-el-selector-de-grupos 2021-03-18 10:04:18 +01:00
fbsanchez 61cb8a43c6 Merge remote-tracking branch 'origin/develop' into ent-6894-uniway-estado-pending-en-server-task-aws 
Conflicts:
	pandora_console/godmode/wizards/DiscoveryTaskList.class.php
 2021-03-17 13:25:38 +01:00
fbsanchez 71a0dcfd0c Merge remote-tracking branch 'origin/develop' into ent-5331-implementar-monitorizacion-de-ms-SQL-Server-en-discovery-como-el-de-oracle 
Conflicts:
	pandora_console/include/constants.php
	pandora_server/lib/PandoraFMS/Recon/Base.pm
 2021-03-17 10:11:58 +01:00
Daniel Rodriguez 2c05a1fe72 Merge branch 'ent-7164-iconos-cambiados-en-varias-vistas' into 'develop' 
fixed icons

See merge request artica/pandorafms!3923
 2021-03-16 17:01:35 +00:00
Daniel Rodriguez aa1e5022a2 Merge branch 'ent-7126-recuperar-selector-de-temas-en-setup-visual' into 'develop' 
revert selector theme

See merge request artica/pandorafms!3915
 2021-03-16 16:49:43 +00:00
Daniel Rodriguez 4bf47eaa35 Merge branch 'ent-7145-boton-de-borrado-de-items-desplazado-en-lista-de-informes' into 'develop' 
fixed position

See merge request artica/pandorafms!3909
 2021-03-16 16:47:54 +00:00
Daniel Rodriguez 9e2d774d8f Merge branch 'ent-7148-estilos-rotos-en-varios-botones-de-custom-graphs-de-informes' into 'develop' 
fixed visual style error

See merge request artica/pandorafms!3905
 2021-03-16 16:47:26 +00:00
Daniel Rodriguez 7d4f6de646 Merge branch 'ent-7162-Botones-descolocados-en-remote-components' into 'develop' 
fixed errors visual

See merge request artica/pandorafms!3920
 2021-03-16 16:45:30 +00:00
Daniel Rodriguez e59600c10b Merge branch 'ent-7151-errores-visuales-en-manage-agents-modo-details' into 'develop' 
Ent 7151 errores visuales en manage agents modo details

See merge request artica/pandorafms!3922
 2021-03-16 16:44:40 +00:00
Daniel Rodriguez 989e6441d8 Merge branch 'ent-6868-massive-operations-snmp-modules' into 'develop' 
Fixed snmpv3 options on modules massive op

See merge request artica/pandorafms!3739
 2021-03-16 16:41:54 +00:00
Luis 6bb6f1121b Fixed snmpv3 options on modules massive op 2021-03-16 16:41:54 +00:00
marcos e689813e2c fixed icons 2021-03-16 13:37:13 +01:00
marcos f05592faeb fixed error 2021-03-16 13:12:03 +01:00
fbsanchez 2862afb7f5 Multicolumn setup for performance and visual settings 2021-03-16 13:00:24 +01:00
Daniel Rodriguez f880e0632d Merge branch 'ent-7137-error-en-merge-reporting-builder-y-policy-agents' into 'develop' 
resolved merge conflict

See merge request artica/pandorafms!3900
 2021-03-16 11:52:55 +00:00
Daniel Barbero Martin fd1c885e2f fixed errors visual 2021-03-16 12:06:59 +01:00
alejandro.campos@artica.es 373ab32bb5 Add pagination to commands view 2021-03-16 11:54:40 +01:00
marcos f765493ce7 revert selector theme 2021-03-16 11:24:05 +01:00
Alejandro Campos 0ad3e3fd8b Merge branch 'develop' into 'ent-6801-No-deberian-poder-añadirse-acciones-a-alertas-generadas-por-politicas' 
# Conflicts:
#   pandora_console/godmode/alerts/alert_list.list.php
 2021-03-16 08:41:55 +00:00
marcos bd4cad3c83 fixed position 2021-03-15 16:28:30 +01:00
marcos 137a2c31ad fixed visual fails 2021-03-15 15:30:56 +01:00
fbsanchez 02b2eec65d Modules alphabetically sorted in Discovery review 2021-03-15 15:16:49 +01:00
marcos 95787e2fe8 fixed visual style error 2021-03-15 14:38:20 +01:00
fbsanchez c20c206a5f Fixed task edit url when nof fully defined (custom-script) 2021-03-15 14:37:08 +01:00
Daniel Maya e4e3007def Fixed img 2021-03-15 13:32:25 +01:00
Daniel Barbero Martin b78f4093ac fixed error tree groups agent edition metaconsole 2021-03-15 13:31:24 +01:00
Daniel Rodriguez 971f86601a Merge branch 'ent-5276-AADCM-creacion-de-paradas-planificadas' into 'develop' 
Refactored downtime editor

See merge request artica/pandorafms!3879
 2021-03-15 11:29:04 +00:00
alejandro.campos@artica.es 88b4b4920f Merge remote-tracking branch 'origin/develop' into ent-5276-AADCM-creacion-de-paradas-planificadas 2021-03-15 12:13:05 +01:00
marcos 09e94bd0e9 resolved merge conflict 2021-03-15 11:43:36 +01:00
Daniel Rodriguez 5bae2be954 Merge branch 'ent-6898-Integracion-integria-en-pandora' into 'develop' 
Ent 6898 integracion integria en pandora

See merge request artica/pandorafms!3898
 2021-03-12 13:18:25 +00:00
alejandro.campos@artica.es b4927d6071 minor fix 2021-03-12 12:46:27 +01:00
alejandro.campos@artica.es 3c5bf3eeef Merge remote-tracking branch 'origin/develop' into temp 2021-03-12 12:34:47 +01:00
Jose Gonzalez 6a427cfa8a Fixed 2021-03-12 11:09:34 +01:00
Jose Gonzalez 5b1517f767 Merge 2021-03-12 11:07:44 +01:00
alejandro.campos@artica.es 2f7a826253 minor fixes 2021-03-11 17:54:20 +01:00
fbsanchez b48af30d96 Merge remote-tracking branch 'origin/develop' into ent-6753-consistencia-en-el-selector-de-grupos 
Conflicts:
	pandora_console/godmode/reporting/create_container.php
	pandora_console/godmode/reporting/graph_builder.main.php
	pandora_console/godmode/reporting/reporting_builder.main.php
	pandora_console/godmode/reporting/visual_console_builder.data.php
	pandora_console/include/javascript/pandora_ui.js
	pandora_console/views/dashboard/formDashboard.php
 2021-03-11 17:47:27 +01:00
Daniel Rodriguez 16ee65ba95 Merge branch 'ent-6781-revision-de-estilos-visuales-y-eliminacion-de-sistemas-skins' into 'develop' 
Ent 6781 revision de estilos visuales y eliminacion de sistemas skins

See merge request artica/pandorafms!3699
 2021-03-11 14:40:24 +00:00
Marcos Alconada d8a628b1c4 Ent 6781 revision de estilos visuales y eliminacion de sistemas skins 2021-03-11 14:40:23 +00:00
daniel 54fc2e89d3 new report histogram 2021-03-11 14:22:28 +00:00
alejandro.campos@artica.es f833429695 restricted action creation on alerts created from policy 2021-03-11 12:38:42 +01:00
fbsanchez 95f1a2abcc Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
 2021-03-11 10:00:17 +01:00
Daniel Rodriguez 05a133bf77 Merge branch 'ent-4659-AADCM-Opcion-de-deshabilitar-mediante-checks-varios-modulos-desde-la-vista-de-agente' into 'develop' 
added option to disable selected agents massively

See merge request artica/pandorafms!3874
 2021-03-10 15:55:07 +00:00
Daniel Rodriguez 38cc8d2ab9 Merge branch 'ent-5284-Granular-los-permisos-de-alerta' into 'develop' 
permissions limitation for command management

See merge request artica/pandorafms!3872
 2021-03-10 15:54:31 +00:00
Daniel Rodriguez 96d5555ed2 Merge branch 'ent-6464-Discovery-id_recon_server-no-cambia-si-no-existe' into 'develop' 
Ent 6464 discovery id recon server no cambia si no existe

Closes pandora_enterprise#6464

See merge request artica/pandorafms!3788
 2021-03-10 15:53:28 +00:00
Jose Gonzalez 92d654763f Fixed some issues 2021-03-10 16:20:45 +01:00
alejandro.campos@artica.es 5c3b5d2be0 minor fixes in scheduled downtime setup 2021-03-10 13:02:17 +01:00
José González b7bd28ba07 Merge branch 'develop' into 'ent-6846-Network-tools-al-setup-general' 
# Conflicts:
#   pandora_console/extras/delete_files/delete_files.txt
 2021-03-10 10:17:27 +00:00
alejandro.campos@artica.es 71e9452988 Merge branch 'ent-6898-Integracion-de-Integria-en-Pandora' of brutus.artica.es:artica/pandorafms into ent-6898-Integracion-de-Integria-en-Pandora 2021-03-10 10:28:45 +01:00
alejandro.campos@artica.es 5913313bae Increased number of possible custom fields for Integria action 2021-03-10 10:28:27 +01:00
Daniel Rodriguez 950b7bcdfd Merge branch 'ent-5140-Añadir-summary-al-availability-graph' into 'develop' 
add summary report availability graph

See merge request artica/pandorafms!3709
 2021-03-09 16:32:12 +00:00
daniel 6e0188fac1 add summary report availability graph 2021-03-09 16:32:12 +00:00
José González 69e1f1fb33 Merge branch 'develop' into 'ent-6846-Network-tools-al-setup-general' 
# Conflicts:
#   pandora_console/extras/delete_files/delete_files.txt
#   pandora_console/include/styles/pandora.css
 2021-03-09 14:39:15 +00:00
Daniel Rodriguez b9f72a1ef9 Merge branch 'ent-6892-Discover-Task-List-no-hay-limitación-por-grupo' into 'develop' 
Ent 6892 discover task list no hay limitación por grupo

See merge request artica/pandorafms!3756
 2021-03-05 12:56:01 +00:00
Daniel Rodriguez ea7c7c88b2 Merge branch 'ent-7025-operaciones-masivas-error' into 'develop' 
Ent 7025 operaciones masivas error

Closes pandora_enterprise#7025

See merge request artica/pandorafms!3833
 2021-03-05 12:49:13 +00:00
alejandro.campos@artica.es b117bbfd7e Refactored downtime editor 2021-03-04 16:27:14 +01:00
fbsanchez daa95d40c8 Merge remote-tracking branch 'origin/develop' into ent-6894-uniway-estado-pending-en-server-task-aws 
Conflicts:
	pandora_console/godmode/wizards/DiscoveryTaskList.class.php
 2021-03-04 14:32:01 +01:00
Daniel Rodriguez 6c2a353812 Merge branch 'ent-6839-Crear-llamadas-a-la-api-para-activar-o-parar-una-discovery-task' into 'develop' 
Ent 6839 crear llamadas a la api para activar o parar una discovery task

See merge request artica/pandorafms!3798
 2021-03-04 10:47:20 +00:00
Daniel Rodriguez 8281d98f83 Merge branch 'ent-6926-Vista-de-servidores-no-muestra-masters' into 'develop' 
Ent 6926 vista de servidores no muestra masters

See merge request artica/pandorafms!3809
 2021-03-04 10:45:05 +00:00
Jose Gonzalez 6ee5b9c3e9 Fix issues 2021-03-04 11:33:21 +01:00
Alejandro Campos d4054f15d0 Merge branch 'develop' into 'ent-6898-Integracion-de-Integria-en-Pandora' 
# Conflicts:
#   pandora_console/extras/mr/45.sql
#   pandora_console/godmode/alerts/configure_alert_action.php
#   pandora_server/util/pandora_db.pl
 2021-03-04 10:27:07 +00:00
Daniel Rodriguez 532c04db39 Merge branch 'ent-6946-bug-en-usuario-con-perfil-group-coordinator-meta' into 'develop' 
fixed error with group cordinator profile with agent management meta

See merge request artica/pandorafms!3842
 2021-03-02 12:48:16 +00:00
Daniel Rodriguez 51404eda8d Merge branch 'ent-7077-no-funciona-doble-auth-meta' into 'develop' 
Ent 7077 no funciona doble auth meta

See merge request artica/pandorafms!3866
 2021-03-02 12:24:03 +00:00
Luis 93a4a90dd6 Ent 7077 no funciona doble auth meta 2021-03-02 12:24:03 +00:00
alejandro.campos@artica.es 9b3f6f1efb added option to disable selected agents massively 2021-03-02 10:42:08 +01:00
fbsanchez d96590aea5 Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 
Conflicts:
	pandora_console/include/functions_ui.php
	pandora_console/include/styles/pandora.css
 2021-03-02 09:40:15 +01:00
Daniel Rodriguez 23cddae261 Merge branch 'ent-5229-filtro-event-report' into 'develop' 
Added string exclude filter to events reports

See merge request artica/pandorafms!3748
 2021-03-01 15:28:18 +00:00
alejandro.campos@artica.es af680b5d92 permissions limitation for command management 2021-03-01 13:58:04 +01:00
Daniel Rodriguez 001c7aaba9 Merge branch 'ent-6950-selector-de-grupos-xxl-en-creacion-de-netflow-filter-y-gis-maps' into 'develop' 
fixed select style

See merge request artica/pandorafms!3835
 2021-03-01 12:24:48 +00:00
Daniel Rodriguez 2ef8bc2178 Merge branch 'ent-6877-Aumentar-el-limite-de-caracteres-de-la-etiqueta-en-contenedore-de-Gráficas' into 'develop' 
Ent 6877 aumentar el limite de caracteres de la etiqueta en contenedore de gráficas

See merge request artica/pandorafms!3791
 2021-03-01 12:24:17 +00:00
Daniel Rodriguez 23edf2f11f Merge branch 'ent-6751-Al-poner-en-unidades-distintas-del-selector-no-se-puede-volver-a-dejar-en-blanco' into 'develop' 
Ent 6751 al poner en unidades distintas del selector no se puede volver a dejar en blanco

See merge request artica/pandorafms!3695
 2021-03-01 12:14:54 +00:00
Daniel Rodriguez 341fc212d5 Merge branch 'ent-6610-links-ayuda-configuración-metaconsola' into 'develop' 
Removed metaconsole empty help links

See merge request artica/pandorafms!3702
 2021-03-01 10:59:50 +00:00
Daniel Rodriguez f6d9997b16 Merge branch 'ent-6547-Visual-styles-cambio-de-tamaño-agente-modulo-y-descripcion' into 'develop' 
Ent 6547 visual styles cambio de tamaño agente modulo y descripcion

See merge request artica/pandorafms!3707
 2021-03-01 10:57:08 +00:00
Daniel Rodriguez f74b73cbb5 Merge branch 'ent-6492-Tokens-que-no-corresponden-en-el-item-SQL-Query-de-informes' into 'develop' 
Fix item sql query remove fields

See merge request artica/pandorafms!3690
 2021-03-01 10:52:28 +00:00
Daniel Rodriguez 4de4709f9f Merge branch 'ent-6401-Espacio-entre-label-e-ID-en-actualización-de-usuario-metaconsola' into 'develop' 
Ent 6401 espacio entre label e id en actualización de usuario metaconsola

See merge request artica/pandorafms!3701
 2021-03-01 10:50:39 +00:00
Daniel Rodriguez 8ff36ef66f Merge branch 'ent-5269-añadir-elemento-al-filtro-de-la-vista-de-administracion-general-de-alertas' into 'develop' 
Ent 5269 añadir elemento al filtro de la vista de administracion general de alertas

See merge request artica/pandorafms!3796
 2021-03-01 10:38:51 +00:00
Daniel Rodriguez c37d883efe Merge branch 'ent-6874-macros-no-se-sustituyen-listado-informes' into 'develop' 
Added macros to reports items list

See merge request artica/pandorafms!3740
 2021-03-01 10:20:54 +00:00
Daniel Rodriguez b2ed2f5511 Merge branch 'ent-6833-planned-downtimes-any-no-funciona' into 'develop' 
Fix issue with adding agents and modules

Closes pandora_enterprise#6833

See merge request artica/pandorafms!3723
 2021-03-01 10:05:59 +00:00
Daniel Rodriguez 07a29fae04 Merge branch 'ent-6608-OPEN-Servidores-SMTP-externos-no-mandan-e-mail-test' into 'develop' 
fixed string

See merge request artica/pandorafms!3870
 2021-03-01 10:05:04 +00:00