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

17733 Commits

Author SHA1 Message Date
fermin831 2719cadc61 Revert "Fixed agents display on GIS maps" 
This reverts commit 6a53e924bb.
 2018-06-22 13:37:17 +02:00
manuel.montes 02822bcfd6 Deleted 'show in two columns' option 2018-06-22 13:36:38 +02:00
fermin831 e19f116637 Fixed add particular agents to GIS layers 2018-06-22 13:33:04 +02:00
fermin831 16cff75242 Revert "Recover critical status the SNMPTrap on SNMP console actions" 
This reverts commit 8ef8f31f67.
 2018-06-22 13:30:10 +02:00
fermin831 6a53e924bb Fixed agents display on GIS maps 2018-06-22 13:28:39 +02:00
artica 0a61a5f5d3 Auto-updated build strings. 2018-06-22 00:01:24 +02:00
fermin831 8ef8f31f67 Recover critical status the SNMPTrap on SNMP console actions 2018-06-21 19:27:33 +02:00
manuel.montes 09ed3fa7c3 Fixed visual bug 2018-06-21 14:21:22 +02:00
daniel 17b726d7a0 changes bd for mr, schema and migrate and update tocken mr 2018-06-21 14:15:27 +02:00
artica f40e3883ec Auto-updated build strings. 2018-06-21 00:01:26 +02:00
fermin831 288d2bafb6 Added in progres selected button to events view 2018-06-20 18:56:44 +02:00
fermin831 251c308d8c Fixed new servers (migration and autoprovision) icons 2018-06-20 18:31:52 +02:00
fermin831 1ccd7d1fd7 Modified set create_snmp_module to permit create remote_snmp_proc modules 2018-06-20 17:07:13 +02:00
nramon ebfbc59055 Merge branch '2407-anadir_phantomjs_docker' into 'develop' 
add phantomjs to docker

See merge request artica/pandorafms!1562
 2018-06-20 16:08:43 +02:00
daniel e7cbd4604e add phantomjs to docker 2018-06-20 16:04:07 +02:00
artica c97530a4ee Updated version and build strings. 2018-06-20 15:19:39 +02:00
Ramon Novoa dc103988ae Fix the current enterprise package number. 2018-06-20 15:18:50 +02:00
Ramon Novoa 7a026bd1c0 Update the MR version. 2018-06-20 14:40:47 +02:00
manuel.montes 11dc746eca Fixed bug in ajax/events.php 2018-06-20 13:31:23 +02:00
nramon cf38c82653 Merge branch '2294-requisitos-api-cluster' into 'develop' 
Minor fixes in api responses

See merge request artica/pandorafms!1560
 2018-06-20 13:03:11 +02:00
fbsanchez d0796a3e09 Minor fixes in api responses 2018-06-20 12:58:46 +02:00
slerena 5efc2d220e Merge branch '2294-requisitos-api-cluster' into 'develop' 
Fixed some acl issues in cluster api methods

See merge request artica/pandorafms!1557
 2018-06-20 12:33:27 +02:00
nramon d960d6f89b Merge branch '2290-seguridad-en-la-api-3' into 'develop' 
2290 seguridad en la api 3

See merge request artica/pandorafms!1556
 2018-06-20 12:23:55 +02:00
fbsanchez 1f06a15d7c Fixed get_cluster_status 2018-06-20 12:20:34 +02:00
fbsanchez ed5381ec69 Merge remote-tracking branch 'origin/develop' into 2294-requisitos-api-cluster 2018-06-20 12:20:13 +02:00
slerena 293fbce674 Merge branch '1827-Graficas-TIP-eje-x-dev' into 'develop' 
fixed minor error default graph for pdf or email 320

See merge request artica/pandorafms!1558
 2018-06-20 12:15:16 +02:00
fermin831 a072cd34de Fixed tree view meta secondary groups repeated agents 2018-06-20 12:09:32 +02:00
daniel 2ae0dc6c52 fixed minor error default graph for pdf or email 320 2018-06-20 11:54:03 +02:00
fbsanchez b75ee89397 Fixed some acl issues in cluster api methods 2018-06-20 11:49:15 +02:00
fermin831 85f84f4211 [API ACL] Fixed meta create_event 2018-06-20 11:46:57 +02:00
slerena 1948cdd3e4 Merge branch '1827-Graficas-TIP-eje-x-dev' into 'develop' 
1827 graficas tip eje x dev

See merge request artica/pandorafms!1555
 2018-06-20 11:36:58 +02:00
daniel aa4f13d17a fixed errors in graphs 2018-06-20 11:31:43 +02:00
artica 2c6ad942cb Auto-updated build strings. 2018-06-20 00:01:24 +02:00
fermin831 56042f596d [ACL API] Fixed groups in event validations 2018-06-19 19:53:54 +02:00
fbsanchez 73567f1859 Trying to adjust graph render sizes 2018-06-19 19:19:38 +02:00
fbsanchez b625f2e5c8 Changed GET to POST in web2image 2018-06-19 19:07:36 +02:00
danielmaya 4214577eea Added new token for static graph height 2018-06-19 18:27:04 +02:00
slerena 41d57dd18a Merge branch 'ent-1859-database-changes' into 'develop' 
Added a new inventory module to the database

See merge request artica/pandorafms!1552
 2018-06-19 18:23:44 +02:00
slerena 517351ef69 Merge branch '197-https-connection-between-server-and-console' into 'develop' 
Allowed https connections with consoles with self-signed certificates

See merge request artica/pandorafms!1553
 2018-06-19 17:19:31 +02:00
slerena c168ad1be0 Merge branch '2290-seguridad-en-la-api-3' into 'develop' 
[API ACL] Fixed the rest of reopened node API ACL fails

See merge request artica/pandorafms!1554
 2018-06-19 17:18:39 +02:00
fermin831 0d2ee35e0f [API ACL] Fixed the rest of reopened node API ACL fails 2018-06-19 17:05:23 +02:00
fbsanchez f7522fcf3f Allowed https connections with consoles with self-signed certificates 2018-06-19 16:48:04 +02:00
slerena b56cb02761 Merge branch '2290-seguridad-en-la-api-3' into 'develop' 
2290 seguridad en la api 3

See merge request artica/pandorafms!1546
 2018-06-19 16:23:09 +02:00
fermin831 2fc6b86251 [ACL API] Undo refix 2018-06-19 16:14:25 +02:00
Alejandro Gallardo Escobar faccbec12d Added a new inventory module to the database 2018-06-19 15:55:33 +02:00
nramon 3614e5caeb Merge branch '1827-Graficas-TIP-eje-x-no-mantiene-ratio-dev' into 'develop' 
Fixed graph with https

See merge request artica/pandorafms!1551
 2018-06-19 15:04:42 +02:00
danielmaya 9bff4f28f4 Fixed graph with https 2018-06-19 15:00:39 +02:00
nramon b72b0afb6d Merge branch 'ent-2204-database-changes' into 'develop' 
Added the database changes for the custom fields of the remote inventory modules

See merge request artica/pandorafms!1550
 2018-06-19 14:26:50 +02:00
Alejandro Gallardo Escobar 04aad98871 Added the database changes for the custom fields of the remote inventory modules 2018-06-19 13:49:36 +02:00
fermin831 c11a8b3d2e Merge branch 'develop' into 2290-seguridad-en-la-api-3 2018-06-19 13:38:13 +02:00