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

19409 Commits

Author SHA1 Message Date
fbsanchez 430facd704 Merge remote-tracking branch 'origin/develop' into ent-5331-implementar-monitorizacion-de-ms-SQL-Server-en-discovery-como-el-de-oracle 
Conflicts:
	pandora_console/include/constants.php
	pandora_server/lib/PandoraFMS/Recon/Base.pm
 2020-06-17 14:00:07 +02:00
fbsanchez 55f10fc640 Merge remote-tracking branch 'origin/develop' into ent-5331-implementar-monitorizacion-de-ms-SQL-Server-en-discovery-como-el-de-oracle 
pandora_console/godmode/wizards/DiscoveryTaskList.class.php
	pandora_server/lib/PandoraFMS/Recon/Base.pm
 2020-06-17 13:41:09 +02:00
fbsanchez 225b82233c Merge remote-tracking branch 'origin/develop' into ent-5778-9834-db2-para-discovery 2020-06-17 10:13:28 +02:00
alejandro-campos e78cd2b581 Merge branch 'develop' into ent-5951-XSS-SNMP-Browser 2020-06-17 09:46:41 +02:00
alejandro-campos f724b51512 Merge branch 'develop' into ent-5951-XSS-SNMP-Browser 2020-06-17 09:44:15 +02:00
artica 5d01c0976b Auto-updated build strings. 2020-06-17 01:00:15 +02:00
fbsanchez c9457b2df3 Merge remote-tracking branch 'origin/develop' into ent-5527-cambio-discovery-sap-para-hacerlo-personalizable 2020-06-16 11:39:17 +02:00
Alejandro Fraguas b2084e3a1e Merge branch 'ent-5978-actualizacion-eventos-mediante-api' into 'develop' 
Added api function for update events

Closes pandora_enterprise#5978

See merge request artica/pandorafms!3305
 2020-06-16 10:23:09 +02:00
Jose Gonzalez e3fa68aef6 Correct event get for metaconsole 2020-06-16 10:03:22 +02:00
Jose Gonzalez 370bd8e34f Stablished correct invalid keys 2020-06-16 09:45:00 +02:00
Jose Gonzalez 40569d2092 Added change for metaconsole 2020-06-16 08:55:54 +02:00
Alejandro Fraguas ee577cff35 Merge branch 'ent-5947-Mala-representacion-de-graficas-en-PDF-Availability-graph-y-Module-histogram-graph' into 'develop' 
Fixed sla graph in pdf

See merge request artica/pandorafms!3279
 2020-06-16 08:29:10 +02:00
artica 90cc854ea5 Auto-updated build strings. 2020-06-16 01:00:16 +02:00
Alejandro Fraguas 8ebf7b34f2 Merge branch 'ent-5910-bug-sql-query-report-illegal-words' into 'develop' 
Modified match for forbidden words. Now not allows spaces or scaped chars....

Closes pandora_enterprise#5910

See merge request artica/pandorafms!3277
 2020-06-15 18:03:36 +02:00
fbsanchez 1eea17f9b9 Merge remote-tracking branch 'origin/develop' into ent-5527-cambio-discovery-sap-para-hacerlo-personalizable 2020-06-15 17:41:53 +02:00
Alejandro Fraguas 4e6528bd3b Merge branch 'ent-5973-fallo-en-la-pantalla-de-inicio-de-usuario-cuando-es-un-dashboard' into 'develop' 
fixed error with dashboard home page

See merge request artica/pandorafms!3301
 2020-06-15 12:38:02 +02:00
Alejandro Fraguas 495b13f387 Merge branch 'ent-5959-xxs-special-day' into 'develop' 
fixed vulnerability on special days

See merge request artica/pandorafms!3286
 2020-06-15 12:14:42 +02:00
Alejandro Fraguas aaa1ae6650 Merge branch 'ent-5958-xss-event-view' into 'develop' 
fixed vulnerabilty on events comments

See merge request artica/pandorafms!3287
 2020-06-15 11:38:01 +02:00
Alejandro Fraguas fae30ca0e2 Merge branch 'ent-5957-XSS-Network-map' into 'develop' 
Solve security issue with field

Closes pandora_enterprise#5957

See merge request artica/pandorafms!3290
 2020-06-15 10:59:03 +02:00
Alejandro Fraguas 80774e9942 Merge branch 'ent-5956-xss-manage-agent-group' into 'develop' 
fixed security error on manage agent group

See merge request artica/pandorafms!3288
 2020-06-15 10:33:50 +02:00
Alejandro Fraguas f8c9448866 Merge branch 'ent-5955-XSS-System-logfiles' into 'develop' 
Solved security issue with system logfiles field

Closes pandora_enterprise#5955

See merge request artica/pandorafms!3289
 2020-06-15 10:24:48 +02:00
Alejandro Fraguas 62ce710b5b Merge branch 'ent-5954-XSS-Tags' into 'develop' 
Control vulnerable fields

Closes pandora_enterprise#5954

See merge request artica/pandorafms!3283
 2020-06-15 10:02:20 +02:00
Alejandro Fraguas 51f61059f4 Merge branch 'ent-5953-XSS-Visual-styles' into 'develop' 
Cleaned tags for affected fields

Closes pandora_enterprise#5953

See merge request artica/pandorafms!3285
 2020-06-15 09:47:19 +02:00
Alejandro Fraguas af8326c042 Merge branch 'ent-5952-XSS-Netscan' into 'develop' 
fix XSS

See merge request artica/pandorafms!3282
 2020-06-15 09:33:08 +02:00
Daniel Rodriguez 38e4281395 Merge branch 'ent-5727-Eventos-campos-Agent-ID-y-Agent-name' into 'develop' 
fixed agent id strange behavior in events table

See merge request artica/pandorafms!3231
 2020-06-15 08:29:37 +02:00
Daniel Rodriguez 146879ee8d Merge branch 'ent-5856-Se-pierde-filtro-al-paginar-en-REPORTS' into 'develop' 
Fixed errors filter search with pagination

See merge request artica/pandorafms!3226
 2020-06-15 08:29:14 +02:00
Daniel Rodriguez 394ba9e94f Merge branch 'ent-5695-Strings-en-informes-Disponibilidad-y-SLA' into 'develop' 
Fixed error functions date default type

See merge request artica/pandorafms!3230
 2020-06-15 08:28:27 +02:00
artica 81d9f6f16b Auto-updated build strings. 2020-06-15 01:00:13 +02:00
artica 350c2caeb9 Auto-updated build strings. 2020-06-14 01:00:14 +02:00
artica 7b12d6c4c4 Auto-updated build strings. 2020-06-13 01:00:44 +02:00
Jose Gonzalez 1fd19802ac Added api function for update events 2020-06-12 14:11:41 +02:00
artica e6aee8582d Auto-updated build strings. 2020-06-12 01:00:19 +02:00
marcos cc16d80a00 fixed error with dashboard home page 2020-06-11 17:49:28 +02:00
fbsanchez b4219472f2 Merge remote-tracking branch 'origin/develop' into ent-5778-9834-db2-para-discovery 2020-06-11 14:55:36 +02:00
fbsanchez 057fcea724 DB2 discovery 2020-06-11 14:53:34 +02:00
Daniel Rodriguez d3a34c5f00 Merge branch 'ent-5779-open-aviso-de-exclusividad-de-enterprise-en-bulk-operations' into 'develop' 
Fix #5779

See merge request artica/pandorafms!3233
 2020-06-11 14:03:14 +02:00
Daniel Rodriguez b0d774524a Merge branch 'ent-5545-Valores-feos-en-graficas-de-agentes' into 'develop' 
Fixed values legend charts sparse

See merge request artica/pandorafms!3245
 2020-06-11 14:02:47 +02:00
Daniel Rodriguez a8328bd4f1 Merge branch 'ent-5568-case-insensitive-para-el-buscador-de-usuarios' into 'develop' 
Ent 5568 case insensitive para el buscador de usuarios

See merge request artica/pandorafms!3244
 2020-06-11 14:00:52 +02:00
vanessa gil b099ffa7eb Updated translations. 2020-06-11 12:40:23 +02:00
Alejandro Fraguas 5ac43db03c Merge branch 'ent-5667-collections-symlinks-doesnt-work' into 'develop' 
Fixed collections symlinks

See merge request artica/pandorafms!3224
 2020-06-11 12:38:02 +02:00
Daniel Rodriguez dab1a8b5cb Merge branch 'ent-5788-Bug-en-item-percentil-de-las-consolas-visuales' into 'develop' 
Fixed input type number size in Firefox

See merge request artica/pandorafms!3221
 2020-06-11 12:01:33 +02:00
Daniel Rodriguez fc420cf9e9 Merge branch 'ent-5811-CSV-export-on-graphs-agent-view-not-adding-all-modules' into 'develop' 
CSV flot export fixes

See merge request artica/pandorafms!3209
 2020-06-11 11:44:11 +02:00
Daniel Rodriguez b3a588d283 Merge branch 'ent-5827-llamada-a-la-api-de-crear-agentes' into 'develop' 
add return error if group = 0 on new agent api

See merge request artica/pandorafms!3212
 2020-06-11 11:38:26 +02:00
Daniel Rodriguez 536d5ae006 Merge branch 'ent-5721-Error-API-la-llamada-no-devuelve-los-agentes-en-critical-cuando-salta-alerta' into 'develop' 
Added cases when critical, warning or normal alert has been fired

See merge request artica/pandorafms!3232
 2020-06-11 11:28:17 +02:00
Daniel Rodriguez e2d80077c6 Merge branch 'ent-5617-9733-Bug-al-cambiar-de-owner-un-evento-al-ser-validado' into 'develop' 
fixed bug: update owner_user when validating an event

See merge request artica/pandorafms!3179
 2020-06-11 11:18:22 +02:00
artica 9a65b61e25 Auto-updated build strings. 2020-06-11 01:00:18 +02:00
alejandro-campos 66e2006b27 fix alert_fired filter 2020-06-10 16:36:39 +02:00
Alejandro Fraguas ee20b5ca94 Merge branch 'ent-5818-snmpbrowser-no-usa-mibs-personalizadas-por-defecto' into 'develop' 
Fixed snmp_read_mib call

See merge request artica/pandorafms!3239
 2020-06-10 14:02:25 +02:00
artica 899ba9ae2e Auto-updated build strings. 2020-06-10 01:00:19 +02:00
alejandro-campos 1c7d4140a2 fixed XSS 2020-06-09 13:20:15 +02:00