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

26811 Commits

Author SHA1 Message Date
Daniel Rodriguez 868694ba24 Merge branch 'ent-6968-Ordenar-servicios-por-descripcion-tree-view' into 'develop' 
Fixed sorting by description

Closes pandora_enterprise#6968

See merge request artica/pandorafms!3825
 2021-03-09 16:33:12 +00: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
Daniel Rodriguez 39e735ed22 Merge branch 'ent-5760-problema-sistema-de-notificaciones-en-servidores-con-pocos-modulos' into 'develop' 
Avoid performance tests if there are not enough modules in system

See merge request artica/pandorafms!3765
 2021-03-09 16:31:38 +00:00
Daniel Barbero Martin 219ca1914d cambio de dominio 2021-03-09 16:02:05 +01: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
Jose Gonzalez f1dd050333 Solve deleted files 2021-03-09 15:19:28 +01:00
Daniel Rodriguez 7a85d0aee4 Merge branch 'ent-2563-Mensajes-de-la-API' into 'develop' 
Ent 2563 mensajes de la api

Closes pandora_enterprise#2563

See merge request artica/pandorafms!3784
 2021-03-09 12:57:28 +00:00
Jose Gonzalez f0dd360786 Fixed merge 2021-03-09 12:56:59 +01:00
Daniel Rodriguez b4fc2a47e9 Merge branch 'ent-1783-cde-contenedores-de-graficas' into 'develop' 
Test REGEXP is valid before apply in MySQL

See merge request artica/pandorafms!3885
 2021-03-09 10:00:54 +00:00
fbsanchez b384e97da5 Test REGEXP is valid before apply in MySQL 2021-03-09 10:17:29 +01:00
artica f9d5767027 Auto-updated build strings. 2021-03-09 01:00:17 +01:00
alejandro.campos@artica.es 0a8c478c47 visual fixes in agent view graphs 2021-03-08 17:48:59 +01:00
Jose Gonzalez 34b7c1003b Fixed error with sorting 2021-03-08 11:20:50 +01:00
Jose Gonzalez c235cfb01a Fixed 2021-03-08 08:21:45 +01:00
artica 2bd9515152 Auto-updated build strings. 2021-03-08 01:00:14 +01:00
artica 438c388423 Auto-updated build strings. 2021-03-07 01:00:17 +01:00
artica 80c568bbdd Auto-updated build strings. 2021-03-06 01:00:19 +01:00
Luis Calvo f445ddc9ea Fixed refresh auto hide on visual c 2021-03-05 14:11:08 +01: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 84da313641 Merge branch 'ent-6910-11185-no-cambio-parametros-llamada-api-get_module_graph' into 'develop' 
Added with option for api_get_module_graph

See merge request artica/pandorafms!3770
 2021-03-05 12:53:24 +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
Jose Gonzalez 0860b6e647 Fix ordenation with subservices 2021-03-05 13:07:53 +01:00
Jose Gonzalez df30df4637 Merge remote-tracking branch 'origin' into ent-6968-Ordenar-servicios-por-descripcion-tree-view 2021-03-05 12:37:29 +01:00
fbsanchez cfded31e1b minor fix 2021-03-05 11:18:47 +01:00
fbsanchez bcde9f940e b64 2021-03-05 11:17:50 +01:00
fbsanchez ae3d54cedf B64 included in user options 2021-03-05 11:11:19 +01:00
fbsanchez 1534fd9c40 API module graph width 2021-03-05 10:30:14 +01:00
artica eb912405a6 Auto-updated build strings. 2021-03-05 01:00:53 +01:00
Luis Calvo f8d9c00183 Fixed alert detail filter and tactical view counter for disabled alers/agents/modules 2021-03-04 20:15:40 +01: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 2955e14849 Merge branch 'ent-6890-condición-agentes-vista-SAP2' into 'develop' 
Ent 6890 condición agentes vista sap2

See merge request artica/pandorafms!3878
 2021-03-04 12:12:12 +00:00
Daniel Maya aace7344a1 Fixed issue with id_grupo 2021-03-04 12:41:14 +01:00
rafael.ameijeiras ab68bcf1d6 adding permissions to apache group 2021-03-04 12:13:16 +01:00
Daniel Rodriguez 20952fa802 Merge branch 'ent-6890-Condición-agentes-vista-SAP' into 'develop' 
Ent 6890 condición agentes vista sap

See merge request artica/pandorafms!3753
 2021-03-04 10:57:53 +00:00
Daniel Maya 1bbbbcaee1 Ent 6890 condición agentes vista sap 2021-03-04 10:57:52 +00: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 bf2705f571 Merge branch 'ent-6528-fallo-acl-servicios' into 'develop' 
Fixed services ACL on services treeview

See merge request artica/pandorafms!3685
 2021-03-04 10:46:31 +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
Daniel Rodriguez d6b7b46139 Merge branch 'ent-6925-vista-previa-en-acciones-de-alertas-recuperadas' into 'develop' 
action_details avoid overlapping colors

See merge request artica/pandorafms!3792
 2021-03-04 10:43:29 +00:00
Daniel Rodriguez c26ba819ce Merge branch 'ent-6887-SAP-view-ACL' into 'develop' 
Added ACL groups in SAP view

See merge request artica/pandorafms!3747
 2021-03-04 10:36:05 +00:00
Daniel Rodriguez 3169492206 Merge branch 'ent-6848-Varios-bugs-en-la-vista-Connected-users' into 'develop' 
changes in connected users view

See merge request artica/pandorafms!3731
 2021-03-04 10:34:30 +00:00
Jose Gonzalez 6ee5b9c3e9 Fix issues 2021-03-04 11:33:21 +01:00
Daniel Rodriguez 94b04a8ef4 Merge branch 'ent-6106-Exportacion-CSV-en-icono-grafica-es-diferente-a-la-exportacion-normal' into 'develop' 
Fix styles file export_data

See merge request artica/pandorafms!3691
 2021-03-04 10:29:52 +00:00
daniel fbf26fab91 Fix styles file export_data 2021-03-04 10:29:52 +00: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
artica 4d1cab6b67 Auto-updated build strings. 2021-03-04 01:00:19 +01:00
Daniel Rodriguez 7b4f24dfbf Merge branch 'ent-7101-Problemas-graves-visualizacion-de-Consolas-Visuales-en-Dashboards' into 'develop' 
fixed errors CV dashboards

See merge request artica/pandorafms!3876
 2021-03-03 12:42:02 +00:00
daniel 6db07e5fe0 fixed errors CV dashboards 2021-03-03 12:42:02 +00:00