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

25858 Commits

Author SHA1 Message Date
Daniel Rodriguez 9f4397a760 Merge branch 'ent-6373-10641-eventos-de-going-to-normal-cada-5-minutos' into 'develop' 
FF keep counters fix

See merge request artica/pandorafms!3489
 2020-10-07 16:04:43 +02:00
Daniel Rodriguez a32e6ad9b0 Merge branch 'ent-6397-Revision-visual-en-informes' into 'develop' 
fixed visual errors and default values

See merge request artica/pandorafms!3500
 2020-10-07 16:03:52 +02:00
daniel 3455de7f85 fixed visual errors and default values 2020-10-07 16:03:52 +02:00
Daniel Rodriguez f83737b01f Merge branch 'ent-6433-server-does-not-have-access-to-the-api' into 'develop' 
Ent 6433 server does not have access to the api

Closes pandora_enterprise#6433

See merge request artica/pandorafms!3503
 2020-10-07 14:55:46 +02:00
fbsanchez 5a5fb6eeea Allow define time start greater than time end in weekly planed downtimes 2020-10-07 14:49:46 +02:00
fbsanchez 0deff70f8b Alert report (group) Group + secondary groups + recursion 2020-10-07 14:07:17 +02:00
fbsanchez ac4904f123 Avoid host latency "fake" value 0 2020-10-07 12:22:46 +02:00
Daniel Barbero Martin c4c987d6c1 fixed errors availability reports 2020-10-07 12:12:06 +02:00
fbsanchez 5ce1bd23e4 Discovery task instead Recon task in some places 2020-10-07 10:56:40 +02:00
fbsanchez 2ba412cb55 Minor fixes discovery tasklist usability 2020-10-07 10:29:43 +02:00
Daniel Rodriguez ac47db4986 Merge branch 'ent-6370-Opciones-para-quitar-portada-y/o-indice' into 'develop' 
add new token to report

See merge request artica/pandorafms!3487
 2020-10-07 09:34:43 +02:00
daniel 40864eee6b add new token to report 2020-10-07 09:34:43 +02:00
artica d677fedc0e Auto-updated build strings. 2020-10-07 01:00:18 +02:00
alejandro-campos 929310d0e9 fixed bad module id reference 2020-10-06 17:33:34 +02:00
marcos 848f60229a updates on 2FA all users feature 2020-10-06 17:02:58 +02:00
fbsanchez ff8aaf18fe Group event reports (with secondary groups) 2020-10-06 15:48:12 +02:00
fbsanchez 35b80f0778 Merge remote-tracking branch 'origin/develop' into ent-6346-9940-event-group-no-muestra-eventos-para-grupos-secundarios 2020-10-06 13:00:06 +02:00
Daniel Rodriguez b6cf44184d Merge branch 'ent-6394-api-delete-agent-no-funciona-meta' into 'develop' 
add new acl on delete agent api/cli

See merge request artica/pandorafms!3499
 2020-10-06 12:33:47 +02:00
alejandro-campos 2915a3bd35 fixed email test 2020-10-06 11:07:46 +02:00
artica 63ed443b98 Auto-updated build strings. 2020-10-06 01:00:19 +02:00
Daniel Rodriguez 2a845f64e3 Merge branch 'ent-6013-Alto-Y-de-las-graficas-customizable' into 'develop' 
Add new token chart fit to content

See merge request artica/pandorafms!3481
 2020-10-05 17:03:30 +02:00
daniel 1b5ccfb20a Add new token chart fit to content 2020-10-05 17:03:30 +02:00
Jose Gonzalez 6459c6aa73 Update the correct file 2020-10-05 15:15:10 +02:00
Jose Gonzalez 0da066954b Modified localhost for 127.0.0.1 for ACL control 2020-10-05 15:12:18 +02:00
Daniel Rodriguez e403c781ea Merge branch 'ent-5822-prueba-concepto-modal-selector-de-grupos' into 'develop' 
Group selection improvement

See merge request artica/pandorafms!3450
 2020-10-05 13:11:23 +02:00
Jose Gonzalez e8e20b933c Testing 2020-10-05 12:53:49 +02:00
fbsanchez cc3189196c Fix secondary groups match while group filtering 2020-10-05 12:45:26 +02:00
marcos e5fe9d5c29 feature 2FA_all_users 2020-10-05 12:29:51 +02:00
Daniel Rodriguez 099a0e4d67 Merge branch 'ent-6145-Mostrar-AVG-MAX-MIN-en-graficas-con-selector-individual' into 'develop' 
add new options char

See merge request artica/pandorafms!3471
 2020-10-05 12:04:46 +02:00
daniel 48831b5032 add new options char 2020-10-05 12:04:46 +02:00
fbsanchez 27c2fa0860 minor fix 2020-10-05 11:52:41 +02:00
Jose Gonzalez 50dd166cb3 Testing 2020-10-05 11:48:06 +02:00
fbsanchez e21fa82b48 Merge remote-tracking branch 'origin/develop' into ent-5822-prueba-concepto-modal-selector-de-grupos 2020-10-05 10:58:21 +02:00
marcos a1048301e8 add new acl on delete agent api/cli 2020-10-05 09:02:11 +02:00
artica b1d218d875 Auto-updated build strings. 2020-10-05 01:00:14 +02:00
artica 2965099f2f Auto-updated build strings. 2020-10-04 01:00:17 +02:00
artica 344cf25874 Auto-updated build strings. 2020-10-03 01:00:18 +02:00
fbsanchez 2187f9d0c9 Merge remote-tracking branch 'origin/develop' into ent-5822-prueba-concepto-modal-selector-de-grupos 
Conflicts:
	pandora_console/godmode/reporting/reporting_builder.item_editor.php
 2020-10-02 14:56:07 +02:00
fbsanchez ea3f147bad minor fixes group selector 2020-10-02 14:31:41 +02:00
Daniel Rodriguez 350018982c Merge branch 'ent-6366-Definir-tipo-de-grafica-en-informes-de-grafica' into 'develop' 
add render graph to reports

See merge request artica/pandorafms!3483
 2020-10-02 14:16:55 +02:00
daniel a5d5a45cac add render graph to reports 2020-10-02 14:16:55 +02:00
fbsanchez 07ed5ac9d8 minor fix AJAX group selector in MC 2020-10-02 14:00:04 +02:00
fbsanchez 2830af06e9 Merge remote-tracking branch 'origin/develop' into ent-5145-omnishell-agentes-windows 
Conflicts:
	pandora_agents/unix/pandora_agent
 2020-10-02 13:28:08 +02:00
fbsanchez da0c8355c9 RC1 Omnishell for windows 2020-10-02 13:21:08 +02:00
Daniel Rodriguez 1cdb91a02d Merge branch 'ent-6302-proyectos-anadir-un-campo-de-numero-de-ticket-para-modulos' into 'develop' 
Custom id improvements

See merge request artica/pandorafms!3464
 2020-10-02 13:07:59 +02:00
Daniel Rodriguez e9ec50c81f Merge branch 'ent-6315-pandora_db-genere-un-db-lock-cuando-se-este-ejecutando-ha' into 'develop' 
pandora_db only runs on the master server.

See merge request artica/pandorafms!3477
 2020-10-02 12:26:38 +02:00
artica 354ae84171 Auto-updated build strings. 2020-10-02 01:00:20 +02:00
fbsanchez c95855cd5d omnishell_client.exe 2020-10-01 20:58:03 +02:00
fbsanchez beac005a44 RC1 pandoraFMS windows agent with omnishell reference 2020-10-01 20:56:09 +02:00
fbsanchez 3bed8a7efa Minor fix 2020-10-01 20:07:31 +02:00