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

12853 Commits

Author SHA1 Message Date
fbsanchez 94a7b625fb Merge remote-tracking branch 'origin/develop' into ent-6012-servicios-dinamicos 
Conflicts:
	pandora_console/extras/mr/39.sql
 2020-06-22 14:06:13 +02:00
Luis efb69c18bc Ent 5809 message delete not working 2020-06-22 13:52:54 +02:00
fbsanchez 166978f3aa Merge remote-tracking branch 'origin/develop' into ent-5759-intervalo-de-oracle-discovery-sale-mal 2020-06-22 12:25:04 +02:00
Daniel Rodriguez 30ce7fbc97 Merge branch 'ent-5726-Colors-severity-Eventos' into 'develop' 
fixed bad constants

See merge request artica/pandorafms!3246
 2020-06-22 11:20:59 +02:00
Luis bbf6fe8beb Fixed image modules historic report 2020-06-22 11:20:26 +02:00
Alejandro Fraguas 01c72e09b4 Merge branch 'ent-5997-marca-horaria-graficas-modulos' into 'develop' 
Returned timestamp message for graphs

Closes pandora_enterprise#5997

See merge request artica/pandorafms!3306
 2020-06-22 10:30:32 +02:00
marcos 1eb3891e94 Merge remote-tracking branch 'origin/develop' into ent-5958-xss-event-view 2020-06-22 09:44:34 +02:00
artica 6103e55287 Auto-updated build strings. 2020-06-22 01:00:13 +02:00
artica f601d43bb7 Auto-updated build strings. 2020-06-21 01:00:13 +02:00
artica 112f2cc25c Auto-updated build strings. 2020-06-20 01:00:19 +02:00
marcos 7cfc68a3d6 ignore keys on xss event comments 2020-06-19 10:59:43 +02:00
Alejandro Fraguas 71c8451727 Merge branch 'ent-4973-Numero-de-estados-muestras-en-Availability-graph' into 'develop' 
Fixed SLA error counter check

See merge request artica/pandorafms!3225
 2020-06-19 10:05:41 +02:00
artica 9beb1ce22f Auto-updated build strings. 2020-06-19 01:00:15 +02:00
Alejandro Fraguas 1e745c927c Merge branch 'ent-5905-10107-AD-Fallback-to-local-authentication-activo-siempre' into 'develop' 
fixed ad authentication

See merge request artica/pandorafms!3269
 2020-06-18 17:40:31 +02:00
Luis 28da2b9afb Ent 5473 report template inventory 2020-06-18 13:19:04 +02:00
artica c6c9b63338 Auto-updated build strings. 2020-06-18 01:00:14 +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
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
Jose Gonzalez cdf4109ad4 Returned timestamp message for graphs 2020-06-15 16:14:34 +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 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 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
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
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 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
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