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

4203 Commits

Author SHA1 Message Date
Daniel Barbero Martin 0b36853553 Wip command center 2021-05-24 17:35:15 +02:00
Junichi Satoh 362855a24e Fixed to follow ACL with get_agents_group_json. 2021-05-24 18:56:18 +09:00
José González d3bd24fc18 Fixed some errors and fixed issue finding policies 2021-05-24 11:01:50 +02:00
fbsanchez 538e7beb48 Public access using PublicLogin interface 2021-05-19 11:57:17 +02:00
fbsanchez 09ccaf254e Fixed public access and added PublicLogin interface, including code style fixex 2021-05-19 11:31:52 +02:00
Daniel Barbero Martin 3eba993c5c Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-19 08:36:26 +02:00
Daniel Barbero Martin ec6cb4d532 fix category, Os, tags, user_edit synch 2021-05-18 10:57:21 +02:00
fbsanchez 9666b76fa9 Common requirements using base url 2021-05-18 10:56:40 +02:00
Daniel Rodriguez b8fe685028 Merge branch 'ent-7482-Integracion-Pandora-Integria-credenciales-de-usuario' into 'develop' 
implemented user level authentication for integria ims integration

See merge request artica/pandorafms!4117
 2021-05-17 14:41:11 +00:00
alejandro.campos@artica.es 663d1dcf75 minor fix 2021-05-17 13:43:20 +02:00
Daniel Rodriguez 203310d13b Merge branch 'ent-7538-traza-en-tree-view-nodo' into 'develop' 
remove vamos a ver

See merge request artica/pandorafms!4126
 2021-05-14 09:39:07 +00:00
Daniel Rodriguez 5b2c340163 Merge branch 'ent-6085-Bandwidth-view-vista-de-interfaces' into 'develop' 
Create interface views

See merge request artica/pandorafms!4023
 2021-05-14 09:37:48 +00:00
alejandro.campos@artica.es 2c065d6f38 visual fix 2021-05-14 10:14:53 +02:00
alejandro.campos@artica.es 86447e2a0b visual fix 2021-05-14 10:10:42 +02:00
alejandro.campos@artica.es 172afc9070 minor change 2021-05-13 13:40:09 +02:00
Alejandro Campos caaa9c407e Merge branch 'develop' into 'ent-7482-Integracion-Pandora-Integria-credenciales-de-usuario' 
# Conflicts:
#   pandora_console/extras/mr/47.sql
#   pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php
 2021-05-13 11:39:24 +00:00
alejandro.campos@artica.es 9cde8c345f removed deprecated incident permissions 2021-05-13 13:33:45 +02:00
marcos d711d71392 remove vamos a ver 2021-05-13 13:09:42 +02:00
Daniel Rodriguez ed4e89a4d0 Merge branch 'ent-7517-11735-fallo-graficas-snmp-interface-en-vista-de-agente-con-black-theme' into 'develop' 
fixed visual error on snmp interfaces agent graphs  black theme

See merge request artica/pandorafms!4119
 2021-05-12 12:52:44 +00:00
Marcos Alconada f8eafa5015 fixed visual error on snmp interfaces agent graphs black theme 2021-05-12 12:52:44 +00:00
Daniel Rodriguez 4e871ed296 Merge branch 'ent-6983-typo-en-traduccion' into 'develop' 
fixed wrong string

See merge request artica/pandorafms!4099
 2021-05-12 07:55:09 +00:00
Daniel Rodriguez 8a3d977e82 Merge branch 'ent-5401-Búsqueda-de-módulo-por-ID-al-llegar-desde-link-de-consola' into 'develop' 
Ent 5401 búsqueda de módulo por id al llegar desde link de consola

See merge request artica/pandorafms!4026
 2021-05-11 15:38:01 +00:00
Daniel Rodriguez fb539be410 Merge branch 'ent-7479-Integracion-Integria-IMS-falla-subida-de-adjuntos' into 'develop' 
fixed bug in file attachment

See merge request artica/pandorafms!4102
 2021-05-11 07:40:54 +00:00
Daniel Rodriguez b6169575a9 Merge branch 'ent-7155-bug-edicion-tickets-integria' into 'develop' 
Ent 7155 bug edicion tickets integria

See merge request artica/pandorafms!3991
 2021-05-10 09:17:14 +00:00
Luis a94c70551d Ent 7155 bug edicion tickets integria 2021-05-10 09:17:14 +00:00
Daniel Rodriguez a0197dab87 Merge branch 'ent-7453-Busqueda-alertas-en-vista-de-agente-no-funciona' into 'develop' 
Ent 7453 busqueda alertas en vista de agente no funciona

See merge request artica/pandorafms!4084
 2021-05-10 09:15:40 +00:00
Daniel Rodriguez 514a91c853 Merge branch 'ent-6541-quitar-id-usuario-url-seccion-usuario' into 'develop' 
Ent 6541 quitar id usuario url seccion usuario

Closes pandora_enterprise#6541

See merge request artica/pandorafms!3990
 2021-05-10 09:08:59 +00:00
Daniel Rodriguez 6faefa4afa Merge branch 'ent-7096-unificar-nombres-downtimes' into 'develop' 
Unified downtime name as scheduled downtime

See merge request artica/pandorafms!4001
 2021-05-10 09:06:43 +00:00
Luis f25256a74d Unified downtime name as scheduled downtime 2021-05-10 09:06:43 +00:00
Daniel Rodriguez b609bbfdd9 Merge branch 'ent-7240-error-acl-graficas-tree-view' into 'develop' 
Fixed metaconsole ACL on module graphs view

See merge request artica/pandorafms!3987
 2021-05-10 08:15:50 +00:00
alejandro.campos@artica.es fdeaf52912 implemented user level authentication for integria ims integration 2021-05-07 14:29:29 +02:00
José González ce5934b9a1 Added form-type buttons for user-actions 2021-05-06 14:46:58 +02:00
Daniel Rodriguez 77a1de6b1b Merge branch 'ent-7285-No-aparece-mensaje-en-el-TreeView-al-filtrar' into 'develop' 
Ent 7285 no aparece mensaje en el tree view al filtrar

See merge request artica/pandorafms!4018
 2021-05-06 12:26:58 +00:00
Daniel Rodriguez 8b3ad8602a Merge branch 'ent-7097-varios-bugs-mensajes' into 'develop' 
Ent 7097 varios bugs mensajes

Closes pandora_enterprise#7097

See merge request artica/pandorafms!3996
 2021-05-06 12:25:03 +00:00
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
alejandro.campos@artica.es 256750bcb0 fixed bug in file attachment 2021-05-05 09:51:21 +02:00
marcos 1f5e08a9fe fixed wrong string 2021-05-05 09:23:47 +02:00
José González 0dc1ec449c Added standard headers 2021-04-30 14:44:03 +02:00
José González cea27392c8 Added standard header 2021-04-30 13:39:10 +02:00
José González 46a691c397 Added standard headers 2021-04-30 13:24:55 +02:00
José González 3f33a0ec29 Added standard header 2021-04-30 12:35:02 +02:00
José González 71c88313d5 Added standard header 2021-04-30 10:58:37 +02:00
José González c54ad46f33 Added standard header 2021-04-29 15:35:33 +02:00
José González 9ab027b286 WIP: Upload 2021-04-29 13:28:03 +02:00
alejandro.campos@artica.es 22f151bc6d fixed bug in users search 2021-04-28 17:01:50 +02:00
Daniel Maya a193234270 #7453 Fixed id alert_list 2021-04-28 16:46:27 +02: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 Maya 8ef21d9b15 Ent 7395 filtro de eventos en metaconsola server 2021-04-28 10:50:04 +00: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
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 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 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 dd124fa7d9 Fixed severity 2021-04-26 14:09:07 +02:00
marcos f818b86827 fixed minnor error black theme 7376 2021-04-23 09:56:06 +02:00
alejandro.campos@artica.es 8f58b74976 fixed filter load in events view 2021-04-21 13:05:18 +02:00
Calvo 29e7f44cda Fixed visual bugs on search view reports 2021-04-21 09:41:25 +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
alejandro.campos@artica.es 2732c6db1c fixed bug in api call 2021-04-16 11:22:29 +02: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
alejandro.campos@artica.es 8021b53763 fixed bug on integria api calls 2021-04-15 13:46:28 +02:00
marcos 48cc1283cc add black theme to widget dashboard 2021-04-14 15:09:19 +02: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
marcos 4f803c8abb fixed visual error selects home view 2021-04-13 13:23:22 +02:00
Daniel Maya bdbfe81f31 Fixed id_agente_modulo in sql condiction 2021-04-13 12:24:35 +02:00
alejandro.campos@artica.es 93f3551326 Create interface views 2021-04-12 18:17:09 +02:00
Daniel Rodriguez b4e469c463 Merge branch 'ent-7040-forzar-URL-publica-meta' into 'develop' 
Reverted failed change

Closes pandora_enterprise#7040

See merge request artica/pandorafms!4007
 2021-04-12 14:40:28 +00:00
Daniel Maya 22914f410c Fixed no data found in tree view 2021-04-12 12:14:47 +02:00
Daniel Rodriguez 79b11a6b30 Merge branch 'ent-4264-cambios-vista-de-eventos' into 'develop' 
Ent 4264 cambios vista de eventos

See merge request artica/pandorafms!3893
 2021-04-12 08:47:13 +00:00
Marcos Alconada dafa88c27d Ent 7266 black theme mala implementacion de vista de ticket integracion integria 2021-04-09 10:00:11 +00:00
Daniel Rodriguez a203a6e80d Merge branch 'ent-7269-black-theme.vista-ppal-agente-la-caja-de-vista-de-logs-sale-encogida' into 'develop' 
fixed size box log sources status

See merge request artica/pandorafms!4006
 2021-04-09 09:35:50 +00:00
Jose Gonzalez 34b01fdf51 Merge 2021-04-07 13:10:52 +02:00
Daniel Rodriguez b89a860ba7 Merge branch 'ent-6969-bug-refresco-eventos' into 'develop' 
Fixed mixed response from event datatables

See merge request artica/pandorafms!3952
 2021-04-07 10:55:25 +00:00
Daniel Rodriguez ed6fa1a803 Merge branch 'ent-2685-7938-aadcm-dashboards-en-metaconsola' into 'develop' 
dashboards meta

See merge request artica/pandorafms!3840
 2021-04-07 10:53:31 +00:00
marcos 7a5125ea8c fixed size box log sources status 2021-04-07 11:52:57 +02:00
Daniel Rodriguez e54e06b6ac Merge branch 'ent-7030-Alertas-sonoras-VS-eventos-API' into 'develop' 
fixed errors sound events

See merge request artica/pandorafms!3916
 2021-04-06 17:11:37 +00:00
daniel 89ffb05466 fixed errors sound events 2021-04-06 17:11:37 +00:00
Calvo 0b1e60b8cf Fixed view icon on report and custom graphs 2021-04-06 18:18:17 +02:00
fbsanchez 5143bbdfdb networkmaps in dashboards MC 2021-04-06 16:47:32 +02:00
fbsanchez 55e272c360 MC dashboards agent_module fixes 2021-04-06 12:53:12 +02:00
Jose Gonzalez cf4b62d4d7 Solved issue with HTML adding in subject 2021-04-06 10:37:14 +02:00
José González bfaf8a8794 WIP: Backup upload 2021-04-05 17:55:46 +02:00
Jose Gonzalez 25e4c1017a WIP: Backup upload 2021-04-05 11:06:20 +02:00
Jose Gonzalez 0308fdbdc2 Clean debug lines 2021-03-31 13:29:09 +02:00
Jose Gonzalez 01a037e2d3 Changed method of send id parameter 2021-03-31 13:27:58 +02:00
fbsanchez 700817acaf Merge branch 'develop' into 'ent-2685-7938-aadcm-dashboards-en-metaconsola' 
Conflicts:
   pandora_console/include/functions_html.php
 2021-03-31 10:12:36 +00:00
Calvo d0bddbe27c Fixed metaconsole ACL on module graphs view 2021-03-31 10:30:18 +02:00
Daniel Rodriguez 8a62fa67ad Merge branch 'ent-7171-iconos-poco-visibles-en-monitor-detail-black-theme' into 'develop' 
Ent 7171 iconos poco visibles en monitor detail black theme

See merge request artica/pandorafms!3929
 2021-03-30 09:51:04 +00:00
marcos 063bbb4433 resolved conflict merge 2021-03-30 11:31:29 +02:00
marcos e26c2eb76d fixed icon 2021-03-29 14:30:00 +02:00
marcos 0166c3066f fixed icon 2021-03-29 12:20:27 +02:00
Marcos Alconada 9e1bacb66e fixed visual error 2021-03-29 07:23:03 +00:00
Marcos Alconada 9dd17acb57 fixed visual error 2021-03-26 13:40:55 +00:00
Marcos Alconada 3d350ba481 fixed visual error 2021-03-26 09:32:30 +00:00
Calvo d9d98fe1e3 Fixed mixed response from event datatables 2021-03-25 13:20:30 +01:00
Daniel Rodriguez effda26dc6 Merge branch 'ent-7201-no-se-muestra-el-modal-de-detalle-de-modulos-en-la-vista-de-agent-detail' into 'develop' 
resolved error with modal module detail on agent detail

See merge request artica/pandorafms!3950
 2021-03-25 09:51:43 +00:00
Daniel Maya 79914082e9 Ent 6850 quitar nta 2021-03-24 15:16:13 +00:00
marcos b4cc075870 resolved error with modal module detail on agent detail 2021-03-24 14:10:46 +01:00