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

13090 Commits

Author SHA1 Message Date
marcos c76238bdb0 Merge remote-tracking branch 'origin/develop' into ent-4425-api-cli-eventos-en-progreso 2020-07-16 09:57:14 +02:00
artica 8b85bba631 Auto-updated build strings. 2020-07-16 01:00:20 +02:00
marcos a6a97d264e changed event in progress method api refactored 2020-07-15 23:41:25 +02:00
marcos 9632b36551 changed event in progress method 2020-07-15 23:36:21 +02:00
artica 593ed43f10 Auto-updated build strings. 2020-07-15 01:00:17 +02:00
Daniel Rodriguez 846fd10ce1 Merge branch 'ent-5824-connection-lost-warn' into 'develop' 
Ent 5824 connection lost warn

See merge request artica/pandorafms!3326
 2020-07-14 18:10:11 +02:00
Daniel Rodriguez 76828ba745 Merge branch 'ent-5769-borrado-de-eventos-no-pide-confirmacion' into 'develop' 
Ent 5769 borrado de eventos no pide confirmacion

See merge request artica/pandorafms!3271
 2020-07-14 11:04:03 +02:00
Daniel Rodriguez 52dc38fcb2 Merge branch 'ent-5672-Graficas-gauge-no-se-muestran-bien-en-PDF' into 'develop' 
Fixed error in gauges

See merge request artica/pandorafms!3261
 2020-07-14 11:01:21 +02:00
marcos 26e0703617 Merge remote-tracking branch 'origin/develop' into ent-4425-api-cli-eventos-en-progreso 2020-07-14 10:05:18 +02:00
artica f81e66084c Auto-updated build strings. 2020-07-14 01:00:16 +02:00
Daniel Rodriguez 1e31eae1a2 Merge branch 'ent-6130-Errores-en-Custom-graph-Informes-de-metaconsola' into 'develop' 
Fixed errors custom graph metaconsole

See merge request artica/pandorafms!3376
 2020-07-13 13:13:29 +02:00
marcos 2a62f3328a show hidden title on setup notifications 2020-07-13 13:00:47 +02:00
daniel f3ad52e0fa Ent 5532 edicion creacion de templates acciones comandos modo centralizado 2020-07-13 12:23:46 +02:00
Daniel Barbero Martin 293cdc6c08 Fixed errors custom graph metaconsole 2020-07-13 11:48:11 +02:00
Daniel Rodriguez ad93a7c681 Merge branch 'ent-5445-Item-prediction-date-no-funciona-correctamente-en-meta' into 'develop' 
fix prediction date item in meta

See merge request artica/pandorafms!3340
 2020-07-13 11:12:53 +02:00
Daniel Rodriguez 47686f2f51 Merge branch 'ent-5618-bug-en-nombres-de-los-usuarios-en-el-owner-de-eventos' into 'develop' 
Change owner event responses

See merge request artica/pandorafms!3294
 2020-07-13 11:12:02 +02:00
Alejandro Fraguas bd6904b99f Merge branch 'ent-6002-pandora-communty-vulnerabilities' into 'develop' 
Fixed xss event comments vulnerabiluty and some acls on event ajax

See merge request artica/pandorafms!3335
 2020-07-13 10:06:26 +02:00
daniel c0661fc1b7 fixed legend max 10 modules for chart 2020-07-13 10:02:56 +02:00
artica 313607efdf Auto-updated build strings. 2020-07-13 01:00:12 +02:00
artica e80252287c Auto-updated build strings. 2020-07-12 01:00:12 +02:00
artica 9d16783254 Auto-updated build strings. 2020-07-11 01:00:19 +02:00
Daniel Barbero Martin b87c2d986f Fixed errors po and mo 2020-07-10 12:36:57 +02:00
Daniel Rodriguez 9d6fff0850 Merge branch 'ent-5369-parseo-de-event-name-en-exportar-elementos' into 'develop' 
Deleted columns s, options and m on csv datatables events

See merge request artica/pandorafms!3313
 2020-07-10 10:16:34 +02:00
Daniel Rodriguez a83b10ff97 Merge branch 'ent-1957-Informe-agrupado-general' into 'develop' 
Implemented all-in-row data for grouped general report

See merge request artica/pandorafms!3351
 2020-07-10 10:11:57 +02:00
Daniel Rodriguez 0d68dde3db Merge branch 'ent-1940-Peso-en-graficas-personalizadas' into 'develop' 
fixed weight legend

See merge request artica/pandorafms!3339
 2020-07-10 10:10:42 +02:00
Daniel Barbero Martin af87e8c621 fixed errors in dashboard widget groups status 2020-07-10 08:30:57 +02:00
José González f3d1a80252 Merge branch 'develop' into 'ent-6102-edicion-nombre-sincronizacion-alertas-metaconsola' 
# Conflicts:
#   pandora_console/extras/mr/40.sql (solved)
 2020-07-10 08:19:07 +02:00
artica 941dfc2b62 Auto-updated build strings. 2020-07-10 01:00:16 +02:00
fbsanchez 009d5c7bc0 Merge remote-tracking branch 'origin/develop' into ent-6000-operaciones-masivas-de-servicios 2020-07-09 16:51:50 +02:00
fbsanchez 865c2eb208 allowed service create propagate exceptions 2020-07-09 11:35:04 +02:00
artica a410ebffb4 Auto-updated build strings. 2020-07-09 01:00:14 +02:00
Alejandro Fraguas df9ab22fc1 Merge branch 'ent-6012-servicios-dinamicos' into 'develop' 
MR change smart services

See merge request artica/pandorafms!3316
 2020-07-08 18:01:16 +02:00
artica 3b091525f5 Auto-updated build strings. 2020-07-08 01:00:15 +02:00
fbsanchez 3d493f14da massive services 2020-07-07 19:10:24 +02:00
daniel 51104136a9 fixed errors in automatic combined graph 2020-07-07 16:07:13 +02:00
fbsanchez 02299bffdb Merge branch 'ent-6012-servicios-dinamicos' into ent-6000-operaciones-masivas-de-servicios 2020-07-07 11:57:12 +02:00
fbsanchez 98dc5f1796 minor fix range input 2020-07-07 11:54:55 +02:00
Jose Gonzalez 5e039adb26 Solve the issue for alerts, os names and tags 2020-07-07 11:05:19 +02:00
fbsanchez cb38f5569a Merge remote-tracking branch 'origin/develop' into ent-6000-operaciones-masivas-de-servicios 2020-07-07 10:26:27 +02:00
fbsanchez 80015a8691 smart services API adjustments 2020-07-07 10:21:28 +02:00
fbsanchez 0b42d1b61f smart services API adjustments 2020-07-07 10:19:49 +02:00
artica 93ad38888b Auto-updated build strings. 2020-07-07 01:00:14 +02:00
Luis Calvo 71eaebc03b Server notifications clean when solved 2020-07-06 17:01:52 +02:00
fbsanchez 534aa8c7c5 Merge remote-tracking branch 'origin/develop' into ent-6012-servicios-dinamicos 2020-07-06 14:31:55 +02:00
fbsanchez 53a2215a41 minor fix 2020-07-06 14:01:51 +02:00
fbsanchez 2442336f45 Minor fix 2020-07-06 13:58:35 +02:00
fbsanchez a0d489b90e Smart services 2020-07-06 11:10:43 +02:00
Luis Calvo d3087de163 Merge remote-tracking branch 'origin/develop' into ent-5824-connection-lost-warn 2020-07-06 10:49:24 +02:00
artica 50ef2f6e54 Auto-updated build strings. 2020-07-06 01:00:12 +02:00
artica ba9f22f7f9 Auto-updated build strings. 2020-07-05 01:00:12 +02:00
artica d2410e07e0 Auto-updated build strings. 2020-07-04 01:00:16 +02:00
fbsanchez 352da65640 WIP Smart services 2020-07-03 17:52:44 +02:00
alejandro-campos 458d729029 fix snmp browser v2 2020-07-03 14:22:07 +02:00
Luis Calvo 9ae225a505 Fixed snmp community special char 2020-07-03 13:34:04 +02:00
artica f7922b7607 Auto-updated build strings. 2020-07-03 01:00:15 +02:00
alejandro-campos 5b884e714b Implemented all-in-row data for grouped general report 2020-07-02 17:00:19 +02:00
fbsanchez af7981ed05 Service tree view 2020-07-02 14:53:33 +02:00
artica 40659c01da Updated version and build strings. 2020-07-02 10:52:47 +02:00
artica 7eee14de55 Auto-updated build strings. 2020-07-02 01:00:14 +02:00
fbsanchez 112f578512 wip smart services 2020-07-01 20:50:07 +02:00
alejandro-campos 63df6c15f0 Merge branch 'develop' into ent-6030-Problema-codificacion 2020-07-01 16:39:00 +02:00
artica 0a69318d88 Auto-updated build strings. 2020-07-01 01:01:14 +02:00
fbsanchez ffba7b8285 wip services improvements 2020-06-30 18:59:47 +02:00
fbsanchez faaf14bfd4 Merge remote-tracking branch 'origin/develop' into ent-6012-servicios-dinamicos 
Conflicts:
	pandora_console/extras/mr/39.sql
	pandora_console/include/lib/Module.php
 2020-06-30 17:04:33 +02:00
fbsanchez 1d621bd3d5 WIP services 2020-06-30 16:57:08 +02:00
Daniel Rodriguez f0cbd61ad3 Merge branch 'ent-5649-visor-de-log-en-metaconsola' into 'develop' 
Added log_viewer in metaconsole

See merge request artica/pandorafms!3312
 2020-06-30 15:51:51 +02:00
José González 311b259684 Backup upload 2020-06-30 12:16:51 +02:00
artica 8882124487 Auto-updated build strings. 2020-06-30 01:00:17 +02:00
fbsanchez c07daa3199 WIP Services 2020-06-29 19:17:40 +02:00
alejandro-campos b13cab3e2a fix prediction date item in meta 2020-06-29 17:21:23 +02:00
Daniel Barbero Martin 595339613b fixed weight legend 2020-06-29 15:37:37 +02:00
alejandro-campos b7af840a20 changed text 2020-06-29 10:57:19 +02:00
artica 2cb3c5eb57 Auto-updated build strings. 2020-06-29 01:00:14 +02:00
artica bf52e7bbc8 Auto-updated build strings. 2020-06-28 01:00:14 +02:00
artica 2a641c344d Auto-updated build strings. 2020-06-27 01:00:20 +02:00
fbsanchez 032faf8c0c WIP Smart services 2020-06-26 15:48:58 +02:00
Luis Calvo 9a8c42f4ac Fixed xss event comments vulnerabiluty and some acls on event ajax 2020-06-26 15:36:51 +02:00
Manuel Montes b7411da737 Ent 5914 problema css con resolucion pantalla 1366 2020-06-26 13:29:17 +02:00
Daniel Rodriguez 1adcce21af Merge branch 'ent-5386-9454-Graficas-en-tiempo-real-modulos-snmp-no-funcionan-con-caracteres-especiales-en-comunidad' into 'develop' 
fix broken snmp modules real time graphs when community string has certain chars

See merge request artica/pandorafms!3131
 2020-06-26 13:28:04 +02:00
Daniel Rodriguez 7f1bd68c26 Merge branch 'ent-5865-9984-Error-al-realizar-SNMPWalk-en-consola-con-v3-y-caracteres-especiales' into 'develop' 
fixed ajax call params when using url characters

See merge request artica/pandorafms!3237
 2020-06-26 12:41:25 +02:00
artica 03016871ad Auto-updated build strings. 2020-06-26 01:00:17 +02:00
Daniel Rodriguez 40a5262ae8 Merge branch 'ent-6058-SNMP-Browser-v3-No-funciona' into 'develop' 
Fixed error snmp V3 not working

See merge request artica/pandorafms!3333
 2020-06-25 17:09:38 +02:00
Daniel Barbero Martin c588914869 Fixed error snmp V3 not working 2020-06-25 15:31:36 +02:00
Alejandro Fraguas 02bffc7e0d Merge branch 'ent-5935-Logs-de-la-consola-refactorizacion' into 'develop' 
changed console and audit log locations

See merge request artica/pandorafms!3278
 2020-06-25 15:28:13 +02:00
daniel 7dc759f3ac Fixed minor error graph sparse width 2020-06-25 15:18:33 +02:00
Luis 5bc968aefe Ent 5850 error reports historical serialize command snapshots 2020-06-25 15:17:24 +02:00
Daniel Rodriguez ae0ac8dc8c Merge branch 'ent-5832-10030-Faltan-campos-en-API-Events' into 'develop' 
fixed bug in get_events_with_user call

See merge request artica/pandorafms!3213
 2020-06-25 12:21:27 +02:00
daniel 36e57ddd1d New report last value 2020-06-25 12:18:37 +02:00
fbsanchez a8671078f1 Merge remote-tracking branch 'origin/develop' into ent-6012-servicios-dinamicos 
Conflicts:
	pandora_console/install.php
 2020-06-25 11:25:43 +02:00
artica 8735c8a950 Auto-updated build strings. 2020-06-25 01:00:18 +02:00
fbsanchez 45a161426b Services review 2020-06-24 18:01:34 +02:00
Daniel Maya 9e449fe1c3 id server check in api event creation #4158 2020-06-24 13:05:40 +02:00
Daniel Rodriguez 3c5a893c71 Merge branch 'ent-5830-SNMP-Browser-Network-components-OID-info-and-Create-agent-modules' into 'develop' 
Ent 5830 snmp browser network components oid info and create agent modules

See merge request artica/pandorafms!3249
 2020-06-24 12:46:49 +02:00
artica 8748bd9e72 Auto-updated build strings. 2020-06-24 01:00:18 +02:00
Alejandro Fraguas 16fd52c47c Merge branch 'ent-5918-9948-correlacion-de-alertas-no-funcionan-con-logs' into 'develop' 
Improved coment

See merge request artica/pandorafms!3268
 2020-06-23 15:55:09 +02:00
Luis b40b98fc54 Added type to SNMP browser module creation 2020-06-23 14:46:22 +02:00
Daniel Rodriguez 57df59448e Merge branch 'ent-5845-Bug-en-CV-linkadas-desaparece-item' into 'develop' 
Ent 5845 bug en cv linkadas desaparece item

See merge request artica/pandorafms!3255
 2020-06-23 14:45:56 +02:00
Daniel Rodriguez e514840031 Merge branch 'ent-5761-notificacion-max_execution_value-php-consola' into 'develop' 
Ent 5761 notificacion max execution value php consola

See merge request artica/pandorafms!3236
 2020-06-23 14:39:32 +02:00
fbsanchez d4b247acae Merge remote-tracking branch 'origin/develop' into ent-5918-9948-correlacion-de-alertas-no-funcionan-con-logs 2020-06-23 10:17:22 +02:00
alejandro-campos cec16d01b8 Merge branch 'develop' into ent-5935-Logs-de-la-consola-refactorizacion 2020-06-23 09:56:21 +02:00
Alejandro Campos a81e4acbb7 Merge branch 'develop' into 'ent-6030-Problema-de-codificacion' 
# Conflicts:
#   pandora_console/include/functions_config.php
 2020-06-23 09:28:21 +02:00
alejandro-campos 6520ad2107 Added setup token 2020-06-23 09:21:15 +02:00
artica 682f4eebf9 Auto-updated build strings. 2020-06-23 01:00:17 +02:00
Alejandro Fraguas 5d484b4eae Merge branch 'ent-6026-10243-Fatal-error-vista-servidores-metaconsola' into 'develop' 
fix clippy help in meta

See merge request artica/pandorafms!3325
 2020-06-22 16:32:16 +02:00
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
Luis Calvo d346c76322 Connection error dialog working 2020-06-19 23:03:37 +02:00
alejandro-campos d64ff918d6 Merge branch 'develop' into ent-5935-Logs-de-la-consola-refactorizacion 2020-06-19 12:22:28 +02:00
alejandro-campos 1243968872 Merge branch 'develop' into ent-5935-Logs-de-la-consola-refactorizacion 2020-06-19 12:12:52 +02:00
alejandro-campos e7424176ea fix clippy help in meta 2020-06-19 12:01:20 +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
Luis Calvo e56a787ba8 WIP: Connection lost warn 2020-06-18 20:41:14 +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
marcos 1b0d40f88a fixed visual style repsonse buttons 2020-06-18 16:16:37 +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
marcos eed12be281 Deleted columns s, options and m on csv datatables events 2020-06-17 13:05:04 +02:00
Daniel Maya eefe7688b4 Added log_viewer in metaconsole 2020-06-17 12:48:20 +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-campos 98b358e7ad fix vulnerability 2020-06-16 17:27:53 +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
alejandro-campos 53b3cb8925 Merge branch 'develop' into ent-5865-9984-Error-al-realizar-SNMPWalk-en-consola-con-v3-y-caracteres-especiales 2020-06-15 17:10:17 +02:00
marcos 65789ff431 fixed error 2020-06-15 16:57:19 +02:00
alejandro-campos da3a7a9804 fixed pdf status field 2020-06-15 16:43:17 +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