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

21579 Commits

Author SHA1 Message Date
Daniel Rodriguez dd014596d6 Merge branch 'ent-7117-Guardar-puerto-al-crear-network-component-desde-el-SNMP-Browser' into 'develop' 
Ent 7117 guardar puerto al crear network component desde el snmp browser

See merge request artica/pandorafms!3943
 2021-05-06 12:06:21 +00:00
Daniel Rodriguez db92b65fd0 Merge branch 'ent-7211-errores-visuales-en-la-vista-de-agente' into 'develop' 
resolved error with sql message error external tools2

See merge request artica/pandorafms!3979
 2021-05-06 12:05:04 +00:00
artica 6c87f65367 Auto-updated build strings. 2021-05-06 01:00:44 +02:00
Calvo dec202ed78 Fixed agents/alerts view group change when public url foreced 2021-05-05 17:53:52 +02:00
alejandro.campos@artica.es aa4769d331 minor changes 2021-05-05 13:02:53 +02:00
José González 6570441fd2 Fixed issue with type 2021-05-05 12:05:06 +02:00
alejandro.campos@artica.es d358fd894d minor change in integria ims setup 2021-05-05 11:03:32 +02:00
alejandro.campos@artica.es e28c6377de remove log input 2021-05-05 10:35:00 +02:00
alejandro.campos@artica.es 256750bcb0 fixed bug in file attachment 2021-05-05 09:51:21 +02:00
José González 385366a9e1 Merge branch 'develop' into 'ent-7184-duplicate-web-server-module' 
# Conflicts:
#   pandora_console/include/functions_modules.php
 2021-05-05 07:37:02 +00:00
marcos 25867a0fd7 fixed visual error black theme 2021-05-05 09:36:16 +02:00
marcos 1f5e08a9fe fixed wrong string 2021-05-05 09:23:47 +02:00
artica 20466ec0d1 Auto-updated build strings. 2021-05-05 01:00:40 +02:00
artica f0f7244d84 Auto-updated build strings. 2021-05-04 01:00:33 +02:00
artica 5461a4391c Auto-updated build strings. 2021-05-03 01:00:36 +02:00
artica 2494aad730 Auto-updated build strings. 2021-05-02 01:00:30 +02:00
artica 13483e6952 Auto-updated build strings. 2021-05-01 01:00:31 +02:00
fbsanchez 34b02982e1 Ensure valid values (alert correlation) for compat mode for criticity, id_group and id_tag 2021-04-30 15:01:43 +02:00
fbsanchez e179475663 Repaired group selector in rules 2021-04-30 14:54:14 +02:00
fbsanchez 366e9a08d5 minor fix 2021-04-30 14:36:47 +02:00
fbsanchez 6b83deacdd Migrate old rules 2021-04-30 14:34:10 +02:00
vanessa gil 97e7e8c8cb Updated version. 2021-04-30 13:57:00 +02:00
Marcos Alconada c5fe67ddb5 fixed visual error black theme 754 LTS 2021-04-30 10:43:22 +00:00
vanessa gil f51ad33554 Updated version. 2021-04-30 10:34:20 +02:00
artica c95b629776 Auto-updated build strings. 2021-04-30 01:00:41 +02:00
artica 8407c5353f Auto-updated build strings. 2021-04-29 01:00:46 +02:00
Daniel Maya a193234270 #7453 Fixed id alert_list 2021-04-28 16:46:27 +02:00
Daniel Rodriguez 599a38fbd1 Merge branch 'ent-7404-Respuestas-de-eventos-en-usuario-solo-lectura' into 'develop' 
Ent 7404 respuestas de eventos en usuario solo lectura

See merge request artica/pandorafms!4077
 2021-04-28 14:18:35 +00:00
Daniel Rodriguez e9956092d4 Merge branch 'ent-7399-Problemas-integracion-Ehorus-en-Pandora-FMS' into 'develop' 
Fixed errors display tab ehorus

See merge request artica/pandorafms!4078
 2021-04-28 11:24:45 +00:00
Daniel Rodriguez c71733385d Merge branch 'ent-7374-Actualizacion-cadenas-de-traduccion' into 'develop' 
update translate strings

See merge request artica/pandorafms!4063
 2021-04-28 10:53:05 +00:00
Daniel Rodriguez 7eb94fca42 Merge branch 'ent-7395-Filtro-de-eventos-en-Metaconsola-Server' into 'develop' 
Ent 7395 filtro de eventos en metaconsola server

See merge request artica/pandorafms!4071
 2021-04-28 10:50:04 +00:00
Daniel Maya 8ef21d9b15 Ent 7395 filtro de eventos en metaconsola server 2021-04-28 10:50:04 +00:00
Marcos Alconada b00e7eff8b fixed size with select2 in module component 2021-04-28 10:48:32 +00:00
Daniel Rodriguez e117fd8fd0 Merge branch 'ent-7411-Error-SQL-en-items-Module-event-report-y-Agent-event-report-metaconsola' into 'develop' 
Fixed errors SQL metaconsole events

See merge request artica/pandorafms!4076
 2021-04-28 08:44:26 +00:00
fbsanchez e1810cc36f Different way to fix public dashboard 2021-04-28 09:50:04 +02:00
Daniel Rodriguez 5857c0d231 Merge branch 'ent-7393-Filtro-de-eventos-en-Metaconsola-Severity' into 'develop' 
Ent 7393 filtro de eventos en metaconsola severity

See merge request artica/pandorafms!4070
 2021-04-28 06:51:25 +00:00
artica 778d126989 Auto-updated build strings. 2021-04-28 01:00:41 +02:00
fbsanchez 9f3ad33b28 Reference to base public_dashboard url 2021-04-27 18:44:06 +02:00
Daniel Rodriguez 3d3e1acef4 Merge branch 'ent-7382-fallo-visualizacion-ha' into 'develop' 
fixed visual error HA

See merge request artica/pandorafms!4067
 2021-04-27 14:33:17 +00:00
Daniel Rodriguez 28984aa414 Merge branch 'ent-7384-bug-acl-en-usuario-con-permiso-rr-u-o-rw' into 'develop' 
fixed error with rr and rw in report list - acls

See merge request artica/pandorafms!4068
 2021-04-27 14:07:48 +00:00
Daniel Rodriguez 443b43d743 Merge branch 'ent-7380-fallo-visualizacion-edicion-intervalo' into 'develop' 
fixed error time interval editor

See merge request artica/pandorafms!4065
 2021-04-27 14:06:13 +00:00
Daniel Rodriguez c54f542b45 Merge branch 'ent-7376-11735-varios-problemas-de-visualizacion-modo-en-tema-oscuro' into 'develop' 
fixed minnor error black theme 7376

See merge request artica/pandorafms!4064
 2021-04-27 14:05:08 +00:00
Daniel Rodriguez 7b9c638f0d Merge branch 'ent-7349-error-500-importar-recursos-resource-registration' into 'develop' 
Fix reource registraton error 500 on empty or bad ptr file

See merge request artica/pandorafms!4051
 2021-04-27 11:48:17 +00:00
Daniel Rodriguez dedd578fe1 Merge branch 'ent-7329-Fallo-de-conteos-en-tactical-view' into 'develop' 
fixed count in several views

See merge request artica/pandorafms!4052
 2021-04-27 11:47:43 +00:00
Daniel Rodriguez 00b1596c4f Merge branch 'ent-7368-filtro-de-comentarios-de-eventos' into 'develop' 
fixed error with special charact filter in user commens

See merge request artica/pandorafms!4056
 2021-04-27 11:46:16 +00:00
Marcos Alconada 177be1f1a4 fixed error with special charact filter in user commens 2021-04-27 11:46:16 +00:00
Daniel Rodriguez 425dc74123 Merge branch 'ent-7378-create-workunit-alerts-action-form' into 'develop' 
Controlled if Integria IMS is selected for show Create workunit switch

Closes pandora_enterprise#7378

See merge request artica/pandorafms!4066
 2021-04-27 11:45:30 +00:00
Daniel Rodriguez 55c38dfc03 Merge branch 'ent-7377-fallos-en-gis-maps' into 'develop' 
fixed error with creation and updating gis maps

See merge request artica/pandorafms!4072
 2021-04-27 11:44:55 +00:00
Marcos Alconada c57ca2a2b8 fixed error with creation and updating gis maps 2021-04-27 11:44:55 +00:00
Daniel Rodriguez bf70c342ff Merge branch 'ent-7324-notificaciones-no-llegan-en-v754' into 'develop' 
Fixed notifications when not fully configured

See merge request artica/pandorafms!4042
 2021-04-27 11:42:32 +00:00
Daniel Rodriguez 06db949689 Merge branch 'ent-7375-bug-en-creacion-de-politicas' into 'develop' 
fixed error with icon groups policies

See merge request artica/pandorafms!4060
 2021-04-27 10:39:57 +00:00
Daniel Rodriguez 4589e77bc8 Merge branch 'ent-7370-modal-incorrecto-al-editar-el-nodo-de-un-cluster' into 'develop' 
fixed error with modal cluster view

See merge request artica/pandorafms!4057
 2021-04-27 10:39:23 +00:00
Daniel Rodriguez d9a63c4682 Merge branch 'ent-7333-fallos-vista-setup' into 'develop' 
Added path check to config attachment store

See merge request artica/pandorafms!4049
 2021-04-27 10:34:09 +00:00
Luis bec8085ca5 Added path check to config attachment store 2021-04-27 10:34:08 +00:00
Daniel Rodriguez e0c7fc8c1e Merge branch 'ent-7323-Bug-visuales-y-funcionamiento-parametros-de-filtros-de-eventos' into 'develop' 
fixed filter load in events view

See merge request artica/pandorafms!4048
 2021-04-27 10:33:15 +00:00
Daniel Barbero Martin d3f3364830 Fixed errors display tab ehorus 2021-04-27 11:06:17 +02:00
Daniel Maya 49d2e9a437 #7404 fixed acl in event response 2021-04-27 10:19:05 +02:00
Daniel Barbero Martin 8324655aab Fixed errors SQL metaconsole events 2021-04-27 10:03:34 +02:00
artica 8a5f5992ac Auto-updated build strings. 2021-04-27 01:00:39 +02:00
Daniel Maya dd124fa7d9 Fixed severity 2021-04-26 14:09:07 +02:00
Daniel Rodriguez 1b3410af2f Merge branch 'ent-7373-CSV-de-las-graficas-de-modulos-se-generan-vacios' into 'develop' 
Fixed errors charts in open

See merge request artica/pandorafms!4062
 2021-04-26 09:08:48 +00:00
marcos 2db8c73743 fixed error with rr and rw in report list - acls 2021-04-26 10:30:51 +02:00
marcos a47f99a455 fixed visual error HA 2021-04-26 08:36:02 +02:00
artica 72b9748be9 Auto-updated build strings. 2021-04-26 01:00:14 +02:00
artica fa2748ac5d Auto-updated build strings. 2021-04-25 01:00:22 +02:00
artica 351570213f Auto-updated build strings. 2021-04-24 01:00:38 +02:00
José González 68e1e72b46 Controlled if Integria IMS is selected for show Create workunit switch 2021-04-23 13:43:16 +02:00
Daniel Rodriguez 67467e7a90 Merge branch 'ent-7369-wizard-snmp-no-funciona' into 'develop' 
Fixed issue with id_plugin

Closes pandora_enterprise#7369

See merge request artica/pandorafms!4058
 2021-04-23 11:13:56 +00:00
marcos f1134c49fd fixed error time interval editor 2021-04-23 12:38:58 +02:00
marcos f818b86827 fixed minnor error black theme 7376 2021-04-23 09:56:06 +02:00
Daniel Barbero Martin 8d33a4a476 update translate strings 2021-04-23 09:03:09 +02:00
Daniel Barbero Martin fc2da38cbd Fixed errors charts in open 2021-04-23 08:58:23 +02:00
artica f3f44ebbdd Auto-updated build strings. 2021-04-23 01:00:18 +02:00
marcos 0ff28fb9a2 fixed error with icon groups policies 2021-04-22 16:09:05 +02:00
vgilc ce72a5c6ee Merge branch 'ent-7356-SQL-graphs-en-templates-no-muestra-grafico' into 'develop' 
Fixed errors report sql

See merge request artica/pandorafms!4055
 2021-04-22 12:20:02 +00:00
José González e957961ee5 Fixed issue with id_plugin 2021-04-22 14:15:56 +02:00
marcos 733087f704 fixed error with modal cluster view 2021-04-22 13:23:49 +02:00
vgilc cb3bf7fed0 Merge branch 'ent-7367-api-creacion-grupos-error' into 'develop' 
Set default values for max agents in group creation

Closes pandora_enterprise#7367

See merge request artica/pandorafms!4054
 2021-04-22 08:47:59 +00:00
Daniel Barbero Martin 918262f27f Fixed errors report sql 2021-04-22 09:50:22 +02:00
vgilc c42d132269 Merge branch 'ent-7355-fallo-api-crear-agentes' into 'develop' 
Fixed bug on api call create_agent

See merge request artica/pandorafms!4050
 2021-04-22 07:45:08 +00:00
José González 8486e3c64f Set default values for max agents in group creation 2021-04-22 09:40:25 +02:00
vgilc 2b973162b9 Merge branch 'ent-7363-Bug-al-copiar-consola-visual' into 'develop' 
Ent 7363 bug al copiar consola visual

See merge request artica/pandorafms!4053
 2021-04-22 07:07:22 +00:00
daniel a2a3e67d49 Ent 7363 bug al copiar consola visual 2021-04-22 07:07:22 +00:00
artica c7521d27fa Auto-updated build strings. 2021-04-22 01:00:16 +02:00
alejandro.campos@artica.es 1c8e73df9d fixed count in several views 2021-04-21 17:11:32 +02:00
Calvo 888915a1c1 Fix reource registraton error 500 on empty or bad ptr file 2021-04-21 17:04:11 +02:00
Calvo 371f87bcdf Fixed bug on api call create_agent 2021-04-21 15:47:56 +02:00
alejandro.campos@artica.es 8f58b74976 fixed filter load in events view 2021-04-21 13:05:18 +02:00
vgilc c99e810b54 Merge branch 'ent-7331-Bug-en-background-de-widgets-dashboards' into 'develop' 
Fixed errors widgets background black-theme and required group

See merge request artica/pandorafms!4044
 2021-04-21 09:29:10 +00:00
vgilc ac8f669b8e Merge branch 'ent-7338-spinner-infinito-input-agent-grouped-general' into 'develop' 
Fixed infinite spinner on agent field grouped general report

See merge request artica/pandorafms!4046
 2021-04-21 09:28:40 +00:00
Daniel Barbero Martin 998ad91b69 Fixed errors diagnostic 2021-04-21 11:07:20 +02:00
Calvo 00e61aba79 Fixed infinite spinner on agent field grouped general report 2021-04-21 10:59:39 +02:00
Calvo 29e7f44cda Fixed visual bugs on search view reports 2021-04-21 09:41:25 +02:00
Daniel Barbero Martin eb5704a660 Fixed errors widgets background black-theme and required group 2021-04-21 08:57:12 +02:00
artica d4d7494e27 Auto-updated build strings. 2021-04-21 01:00:16 +02:00
fbsanchez b33104c641 Fixed notifications when not fully configured 2021-04-20 13:19:19 +02:00
Daniel Maya a05c5cf555 #6618 Added random name css 2021-04-20 11:46:33 +02:00
alejandro.campos@artica.es c3313848bd Added new field in api call 2021-04-20 11:36:26 +02:00
vgilc 3c7fc18abb Merge branch 'ent-7288-correlacion-eventos-no-permite-crear-condiciones-complejas' into 'develop' 
reviewing correlated alerts

See merge request artica/pandorafms!4024
 2021-04-20 07:56:04 +00:00
vgilc a990689e59 Merge branch 'ent-7268-Falla-sincronizacion-de-inventario-Integria-Pandora' into 'develop' 
changed request protocol

See merge request artica/pandorafms!4033
 2021-04-20 07:31:13 +00:00
vgilc 55677850a6 Merge branch 'ent-7317-11690-problema-grave-consolas-visuales-modo-legacy-activado' into 'develop' 
fixeed visual error vc legacy mode

See merge request artica/pandorafms!4036
 2021-04-20 07:30:11 +00:00
artica 20fe99ef29 Auto-updated build strings. 2021-04-20 01:00:15 +02:00
artica 3737d61793 Updated version and build strings. 2021-04-19 16:09:29 +02:00
fbsanchez 0a6fd37913 minor style change 2021-04-19 14:51:22 +02:00
fbsanchez 50f580c112 Merge remote-tracking branch 'origin/develop' into ent-7288-correlacion-eventos-no-permite-crear-condiciones-complejas 2021-04-19 14:35:59 +02:00
marcos 4655668ca4 fixeed visual error vc legacy mode 2021-04-19 14:16:30 +02:00
marcos 6ebb6f6843 fixeed visual error vc legacy mode 2021-04-19 12:59:52 +02:00
Daniel Rodriguez 71af7103d1 Merge branch 'ent-7267-Fallo-al-meter-comentario-en-ticket-desde-pandora-integracion-integria-pandora' into 'develop' 
fixed bug on integria api calls

See merge request artica/pandorafms!4034
 2021-04-19 07:19:15 +00:00
Daniel Rodriguez 59ec6c850d Merge branch 'ent-6387-limitar-agentes-por-grupo' into 'develop' 
Added control for max agents in groups

Closes pandora_enterprise#6387

See merge request artica/pandorafms!3800
 2021-04-19 07:17:56 +00:00
artica 08abb25fc4 Auto-updated build strings. 2021-04-19 01:00:13 +02:00
artica 1030ef052a Auto-updated build strings. 2021-04-18 01:00:13 +02:00
artica 9ec945fa3c Auto-updated build strings. 2021-04-17 01:00:15 +02:00
alejandro.campos@artica.es 2732c6db1c fixed bug in api call 2021-04-16 11:22:29 +02:00
alejandro.campos@artica.es 3ff361977c check page load protocol on integria setup 2021-04-16 10:02:34 +02:00
Jose Gonzalez 8e503086a2 Event type changed 2021-04-16 09:51:11 +02:00
Jose Gonzalez 494666244d Fixed stupid bug 2021-04-16 09:10:38 +02:00
artica f585e44692 Auto-updated build strings. 2021-04-16 01:00:41 +02:00
Jose Gonzalez 0e12402469 Fixed message issue 2021-04-15 21:20:59 +02:00
Jose Gonzalez 93d70da822 Modified function 2021-04-15 21:20:34 +02:00
Daniel Rodriguez 8cc4ddc9e0 Merge branch 'ent-7293-bug-visual-selector-ip-agente' into 'develop' 
Agent conf ip selector visual fix

See merge request artica/pandorafms!4030
 2021-04-15 14:53:32 +00:00
Jose Gonzalez a6936f16d5 Cleaned event create control for centralized management 2021-04-15 15:50:10 +02:00
fbsanchez 3bc8f6c4ac Merge remote-tracking branch 'origin/develop' into ent-7288-correlacion-eventos-no-permite-crear-condiciones-complejas 2021-04-15 15:33:14 +02:00
Jose Gonzalez 3d3beca727 Added feature of generate event 2021-04-15 15:06:48 +02:00
Daniel Rodriguez 5fbd209a73 Merge branch 'ent-1516-dias-de-la-semana-aparecen-siempre-en-ingles' into 'develop' 
fixed error with weeckly days sla

See merge request artica/pandorafms!3951
 2021-04-15 12:37:38 +00:00
Marcos Alconada 798c1d060f fixed error with weeckly days sla 2021-04-15 12:37:38 +00:00
Daniel Rodriguez 4c46caac72 Merge branch 'ent-4263-idgets-dashboard-en-black-them-que-falta-por-adaptar' into 'develop' 
Ent 4263 idgets dashboard en black them que falta por adaptar

See merge request artica/pandorafms!4031
 2021-04-15 12:36:58 +00:00
marcos e506523fff fixed minnor error 2021-04-15 13:55:14 +02:00
alejandro.campos@artica.es 8021b53763 fixed bug on integria api calls 2021-04-15 13:46:28 +02:00
Marcos Alconada 317bf0da3d minnor error fixed 2021-04-15 10:33:31 +00:00
alejandro.campos@artica.es ada6bccfd6 changed request protocol 2021-04-15 12:12:06 +02:00
Jose Gonzalez a69666aad9 Added Event class 2021-04-15 12:00:32 +02:00
Jose Gonzalez ff177c544d Modified and adapted Event class 2021-04-15 12:00:00 +02:00
marcos 24099644be remove log 2021-04-15 11:22:24 +02:00
fbsanchez 2e45e0bde4 Fixes in table tevent_rule definition 2021-04-15 10:35:21 +02:00
artica fe9109e585 Auto-updated build strings. 2021-04-15 01:00:43 +02:00
fbsanchez 21d72f41f9 Revert "Revert "Update tevent_rule schema"" 
This reverts commit 2b05cde214.

 Changes to be committed:
	modified:   pandora_console/extras/mr/46.sql
	modified:   pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	modified:   pandora_console/pandoradb.sql
 2021-04-15 00:20:42 +02:00
fbsanchez 2b05cde214 Revert "Update tevent_rule schema" 
This reverts commit a80e50b730.

 Changes to be committed:
	modified:   pandora_console/extras/mr/46.sql
	modified:   pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	modified:   pandora_console/pandoradb.sql
 2021-04-14 21:42:19 +02:00
fbsanchez a80e50b730 Update tevent_rule schema 2021-04-14 21:39:58 +02:00
Daniel Rodriguez a93a3b7967 Merge branch 'ent-6933-fix-inconsistency-in-alerts-group-profiles-revised' into 'develop' 
Fixed and improved alert functions.

See merge request artica/pandorafms!3957
 2021-04-14 13:15:29 +00:00
marcos 48cc1283cc add black theme to widget dashboard 2021-04-14 15:09:19 +02:00
Jose Gonzalez f684cef491 Changed audit log for event and refactor 2021-04-14 12:16:28 +02:00
marcos b6ea565118 add black theme to widget dashboard 2021-04-14 12:07:38 +02:00
Daniel Rodriguez 1d6c7c6eed Merge branch 'ent-6782-revision-general-de-la-consola-movil' into 'develop' 
SAML login in mobile console

See merge request artica/pandorafms!3733
 2021-04-14 07:39:29 +00:00
fbsanchez 3dc49bea23 Merge remote-tracking branch 'origin/develop' into ent-7288-correlacion-eventos-no-permite-crear-condiciones-complejas 2021-04-14 09:38:44 +02:00
Calvo 3396af66b0 Agent conf ip selector visual fix 2021-04-14 09:26:19 +02:00
artica 46291eed66 Auto-updated build strings. 2021-04-14 01:00:15 +02:00
Daniel Rodriguez 72480bdb1a Merge branch 'ent-7287-selectores-desplegados-en-home-screen' into 'develop' 
fixed visual error selects home view

See merge request artica/pandorafms!4028
 2021-04-13 14:48:36 +00:00
Daniel Rodriguez fff13ad2ac Merge branch 'ent-6377-proyectos-amazon-s3-en-el-discovery' into 'develop' 
Minor changes

See merge request artica/pandorafms!3930
 2021-04-13 14:31:37 +00:00
marcos 0500b90101 fixed visual error selects home view 2021-04-13 16:29:28 +02:00
marcos 87362d07f4 fixed visual error selects home view 2021-04-13 15:37:44 +02:00