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

11874 Commits

Author SHA1 Message Date
vgilc a42e2eae4c Merge branch '1099-Anadir_TIP_para_graficas_de_interfaz_rev_1' into 'develop' 
fixed minor errors tips

See merge request !842
 2017-09-22 09:30:35 +02:00
vgilc 6bb182bf8f Merge branch '1155-Fallo_en_conexion_con_LDAP_merge_roto_Dani_' into 'develop' 
fixed error bad merge ldap

See merge request !841
 2017-09-22 09:30:29 +02:00
artica c50c7b70da Auto-updated build strings. 2017-09-22 00:01:16 +02:00
daniel 3613d1c1fc fixed minor errors tips 2017-09-21 18:37:57 +02:00
Arturo Gonzalez 9d09f9a436 LDAP in progress 2017-09-21 18:00:32 +02:00
Arturo Gonzalez 98a05f7850 Added changes to ldap adv config 2017-09-21 15:55:21 +02:00
daniel d86d622340 fixed error bad merge ldap 2017-09-21 15:53:45 +02:00
daniel 9337d33ceb tip in graph interfaces 2017-09-21 15:35:28 +02:00
Arturo Gonzalez 8d6e6d2161 Added ldap new fields to conf 2017-09-21 13:43:46 +02:00
Arturo Gonzalez bc077c8a7d Added disable agents in policy when js is crazy 2017-09-21 12:22:55 +02:00
artica 581b6cbae2 Auto-updated build strings. 2017-09-21 00:01:28 +02:00
daniel edb2865430 fixed errors in TIP SPARSE 2017-09-20 17:29:17 +02:00
Arturo Gonzalez f5e1410406 Added fix to macros in pdf view 2017-09-20 17:09:50 +02:00
Arturo Gonzalez 3f253b9db4 Added restriction when report comes from template 2017-09-20 15:44:30 +02:00
enriquecd be0655334d Change installer next button style - #1349 2017-09-20 13:04:36 +02:00
Arturo Gonzalez 526f76d7d1 Added minor change to fix this issue 2017-09-20 12:08:31 +02:00
Arturo Gonzalez 3652f0a0ea Merge branch 'develop' into 1134-url-routes-analyzer-feature-dev 2017-09-20 11:05:35 +02:00
enriquecd 3ae202ff15 Fix error showing image when there is no data to show in graphs - #1283 2017-09-20 10:49:52 +02:00
Arturo Gonzalez 36c13e44c6 Added some changes to label and name macros in custom graphs 2017-09-20 10:48:06 +02:00
enriquecd 4aa4d44d0f Prevent select any and others options at the same time for agents/modules multiselect in modules bulk operations - #1266 2017-09-19 19:14:25 +02:00
Arturo Gonzalez ae657210f8 Fixed error in js library and added good export to graph container graphs 2017-09-19 17:46:12 +02:00
Arturo Gonzalez da763824a9 Added a minor change to test optimization 2017-09-19 10:48:30 +02:00
vgilc 843c190655 Merge branch '1345-corregir_errores_en_graficas_boleanas_de_tip' into 'develop' 
fixed errors in TIP boolean graphs

See merge request !826
 2017-09-19 09:30:56 +02:00
artica 2e802e1b70 Auto-updated build strings. 2017-09-19 00:01:21 +02:00
daniel d54509fd1e fixed errors in TIP boolean graphs 2017-09-18 17:57:43 +02:00
enriquecd e05d0bab25 Compatible with all browsers - #1245 2017-09-18 11:07:59 +02:00
vgilc 4e840651be Merge branch '1217-errors-in-pandora-report-templates-macros-dev' into 'develop' 
1217 errors in pandora report templates macros dev

See merge request !822
 2017-09-18 10:28:54 +02:00
Arturo Gonzalez e3c01374b1 Added changes to meta report templates 2017-09-18 10:18:38 +02:00
vgilc 08ac4c2f35 Merge branch '161-Massive-Operations-remains-at-Console' into 'develop' 
"Massive Operations" had remained at Pandora Console.

Closes #161

See merge request !729
 2017-09-18 10:12:41 +02:00
vgilc bfbee7179d Merge branch 'Problemas_con_full_scale' into 'develop' 
fixed error in full_scale

See merge request !809
 2017-09-18 09:25:10 +02:00
artica 9a6a22718e Auto-updated build strings. 2017-09-18 00:01:20 +02:00
artica 14cea700ad Auto-updated build strings. 2017-09-17 00:01:19 +02:00
artica d35a88e439 Auto-updated build strings. 2017-09-16 00:01:20 +02:00
Arturo Gonzalez e3d42a878a Added changes to NODE 2017-09-15 13:21:51 +02:00
vgilc 27b01240d8 Merge branch '1330-perms-problem-in-cron-jobs-dev' into 'develop' 
Added servers sction in menu to RR perms

See merge request !821
 2017-09-15 10:24:06 +02:00
artica 802a782c9a Auto-updated build strings. 2017-09-15 00:01:21 +02:00
Arturo Gonzalez eb6e67e1ca Added servers sction in menu to RR perms 2017-09-14 17:56:57 +02:00
Daniel Maya d7f3e1ecde New feature. Dynamic units 2017-09-14 12:10:41 +02:00
enriquecd 8907b393df Fix - Horizontal scrolling of elements with hyperlink in label for VC - #1327 2017-09-14 10:27:11 +02:00
artica 41956caa5c Auto-updated build strings. 2017-09-14 00:01:20 +02:00
enriquecd 7b2e2fadc6 Let create a group status visual map element without image selected - #1245 2017-09-13 17:07:35 +02:00
vgilc 754697f51c Merge branch 'ent-966-os_version-en-ficheros-xml-ext-4098-v7-0' into 'develop' 
Ent 966 os version en ficheros xml ext 4098 v7 0

See merge request !813
 2017-09-13 12:53:43 +02:00
artica 4cc2a5da0a Auto-updated build strings. 2017-09-13 00:01:21 +02:00
enriquecd 3f6f544dc7 Fix SLA visual map item - #1318 2017-09-12 16:39:31 +02:00
artica 870a59ba57 Auto-updated build strings. 2017-09-12 00:01:21 +02:00
fermin831 89fc3c457a Fixed no os_version on event agent view 2017-09-11 17:54:28 +02:00
vgilc ab3b6838b9 Merge branch '1296-Barra-de-eventos---Vista-táctica-metaconsola-dev' into 'develop' 
added filter by user groups

See merge request !810
 2017-09-11 16:32:04 +02:00
Arturo Gonzalez 7445ff755f Added lost changes 2017-09-11 16:19:45 +02:00
Daniel Maya 975267eff0 added filter by user groups 2017-09-11 13:51:35 +02:00
Arturo Gonzalez eb03e4753e Minor change 2017-09-11 11:51:08 +02:00
Enrique Camargo ae987427d7 Merge branch 'develop' into '624-Operaciones-multiples-con-elementos-de-la-consola-visual' 
# Conflicts:
#   pandora_console/godmode/reporting/visual_console_builder.editor.js
 2017-09-11 10:44:17 +02:00
vgilc 508a594dba Merge branch '1154-Fallo-en-creación-de-paradas-programadas-en-modo-quiet-dev' into 'develop' 
Added modules selection mode

See merge request !804
 2017-09-11 09:53:06 +02:00
vgilc c9a431d2c9 Merge branch '972-added-disabled-agents-to-policy-agents-selects-dev' into 'develop' 
Added disabled option to get ggroup agents function

See merge request !782
 2017-09-11 09:51:39 +02:00
vgilc d5a89ee1f1 Merge branch 'MR-anadir_resumen_de_grupos_como_elemento_de_consola_visual' into 'develop' 
DB changes for visual console group elements - #1245

See merge request !793
 2017-09-11 09:49:21 +02:00
vgilc da0294b872 Merge branch '1245-Anadir-resumen-de-grupos-como-elemento-de-consola-visual' into 'develop' 
Add show_statistics option for group item - #1245

See merge request !766
 2017-09-11 09:45:45 +02:00
vgilc da0394cc81 Merge branch '1237-Ampliar_caracteres_para_box_de_comunidad_SNMP_en_operaciones_masivas_v7' into 'develop' 
fixed snmp comunity field

See merge request !783
 2017-09-11 09:44:55 +02:00
vgilc 813825a5be Merge branch '1223-Entidades-pendientes-dev' into 'develop' 
Added degree in io_safe_input

See merge request !805
 2017-09-11 09:44:14 +02:00
vgilc 4096a0f5ff Merge branch '1122-Revision-del-estilo-CSS-de-las-paginas-de-ayuda' into 'develop' 
Change pandora help window style - #1122

See merge request !741
 2017-09-11 09:43:39 +02:00
vgilc df1489e08f Merge branch '1194-Extension-DB-inface-en-panel-de-ultima-actividad' into 'develop' 
Fix dbmanager when insert db activity in activity login info panel - #1194

See merge request !739
 2017-09-11 09:42:56 +02:00
vgilc ae0196f7b5 Merge branch '1169-Pandora-FMS-Aplicación-movil-Error-en-ordenacion-de-eventos' into 'develop' 
Fix bad ordination in mobile pandora events list - #1169

See merge request !746
 2017-09-11 09:41:56 +02:00
vgilc 71e737e059 Merge branch '977-module-data-string-format-dev' into 'develop' 
Added new format to string data

See merge request !786
 2017-09-11 09:40:53 +02:00
vgilc 4457b3d849 Merge branch '1079-interfaces-when-agent-comes-to-satellite-dev' into 'develop' 
Added function to get all interfaces

See merge request !764
 2017-09-11 09:38:52 +02:00
vgilc 6bf85a0789 Merge branch '1070-disable-interface-links-in-fictional-nodes-dev' into 'develop' 
Removed interface link function in fictional nodes

See merge request !644
 2017-09-11 09:35:35 +02:00
vgilc fecd2b14e4 Merge branch '1168-icon-in-agents-know-if-is-in-planned-downtime-dev' into 'develop' 
Added image to planned downtime

See merge request !772
 2017-09-11 09:32:49 +02:00
vgilc ffdafce87b Merge branch '1094-no-filter-by-agent-in-status-monitor-dev' into 'develop' 
Added correct filter name

See merge request !652
 2017-09-11 09:26:40 +02:00
vgilc d7eb182dca Merge branch '1084-Conteo-de-vista-tactica-dev' into 'develop' 
Fixed module counter

See merge request !641
 2017-09-11 09:25:47 +02:00
vgilc 99fa1d0aad Merge branch '1216-error-in-edit-networkmaps-open-dev' into 'develop' 
Fixed combo in editor

See merge request !747
 2017-09-11 09:19:59 +02:00
vgilc 585e7d44ee Merge branch '1170-Pandora-FMS-Aplicación-movil-Error-La-barra-de-histograma' into 'develop' 
Change 24h event histogram function in pandora mobile to same that desktop pandora - #1170

See merge request !745
 2017-09-11 09:12:54 +02:00
artica 291871fae0 Auto-updated build strings. 2017-09-11 00:01:20 +02:00
artica e651f64c85 Auto-updated build strings. 2017-09-10 00:01:18 +02:00
artica cc36e2756f Auto-updated build strings. 2017-09-09 00:01:22 +02:00
daniel 731e9bf917 fixed error in full_scale 2017-09-08 16:10:31 +02:00
daniel 8a7b0a0f79 fixed errors in new macro graph treshold 2017-09-08 13:55:03 +02:00
Daniel Maya 1a56c78808 Added degree in io_safe_input 2017-09-08 12:39:00 +02:00
Daniel Maya 32fa42a378 Added modules selection mode 2017-09-08 12:32:21 +02:00
enriquecd 74e4ae3f71 Use alias as name with option default tconfig - #1255 2017-09-08 12:11:15 +02:00
vgilc 2689213fdf Merge branch '1181-add-short-data-option-to-charts-dev' into 'develop' 
Added option to short data or not

See merge request !785
 2017-09-08 10:29:53 +02:00
vgilc c2a132255c Merge branch '1057-No-muestra-imagenes-PNG-en-el-custom-logo-de-los-informes-OPEN' into 'develop' 
Let use png logo images for reports - #1057

See merge request !625
 2017-09-08 10:13:35 +02:00
vgilc b4f0cf12ae Merge branch '1060-Letras-blancas-en-fondo-blanco-con-Black-theme-7' into 'develop' 
Change pandorin dialog font color with black theme - #1060

See merge request !635
 2017-09-08 10:02:45 +02:00
vgilc 054c13695c Merge branch '1203-Hora-descuadrada-en-caja-de-eventos-del-agente' into 'develop' 
Apply padding to event 24h event history bar for agent view - #1203

See merge request !738
 2017-09-08 10:01:47 +02:00
Arturo Gonzalez 2bb5c1e3b3 Added section to agent tabs 2017-09-08 09:01:58 +02:00
artica 7f3539ecf0 Auto-updated build strings. 2017-09-08 00:01:19 +02:00
daniel f2f9cc666e boolean graphs 2017-09-07 18:11:42 +02:00
vgilc 191d6bb0d4 Merge branch '1198-errors-in-boolean-chart-fourth-time-dev' into 'develop' 
Added a change to boolean charts

See merge request !799
 2017-09-07 16:34:19 +02:00
vgilc 5f4f397901 Merge branch '125-Gestión-recolección-y-correlación-de-logs-dev' into 'develop' 
Resolve "Pandora7: Directorio de colecciones en gitlab"

See merge request !798
 2017-09-07 16:33:58 +02:00
Arturo Gonzalez 598b04c2db Added a change to boolean charts 2017-09-07 16:17:41 +02:00
Daniel Maya c8bbe92412 Merge branch '125-Gestión-recolección-y-correlación-de-logs-dev' of https://192.168.50.5:8081/artica/pandorafms into 125-Gestión-recolección-y-correlación-de-logs-dev 2017-09-07 16:16:16 +02:00
Daniel Maya a66a210db1 Update log report 2017-09-07 16:15:17 +02:00
vgilc 3d2948d7eb Merge branch '1198-errors-in-boolean-chart-third-time-dev' into 'develop' 
Updated module chart code

See merge request !796
 2017-09-07 15:29:29 +02:00
Arturo Gonzalez da117723ef Updated module chart code 2017-09-07 15:19:03 +02:00
Arturo Gonzalez c986e4fad7 Added minor change to boolean charts 2017-09-07 14:45:20 +02:00
enriquecd 8ce6920e44 DB changes for visual console group elements - #1245 2017-09-07 12:11:13 +02:00
Arturo Gonzalez 2fba19d55c Added some changes in boolean charts 2017-09-07 11:14:06 +02:00
artica 80027e4d8c Auto-updated build strings. 2017-09-07 00:01:31 +02:00
artica c4a709acf1 Updated version and build strings. 2017-09-06 17:22:32 +02:00
artica ce4d898deb Auto-updated build strings. 2017-09-06 00:01:18 +02:00
Arturo Gonzalez ad2cf22fa4 Added new format to string data 2017-09-05 17:33:38 +02:00
Arturo Gonzalez 5664c72f8b Added option to short data or not 2017-09-05 16:23:21 +02:00
Arturo Gonzalez ba292e5009 Added conf to wmi modules in policies 2017-09-05 15:04:41 +02:00
daniel 8f9fd4cf3d fixed snmp comunity field 2017-09-05 14:39:36 +02:00
Arturo Gonzalez 1dae698333 Added disabled option to get ggroup agents function 2017-09-05 13:40:57 +02:00
vgilc daca367320 Merge branch '832-pandora-exec-proxy-xml-description-dev' into 'develop' 
Added safe output to conf

See merge request !781
 2017-09-05 13:20:32 +02:00
Arturo Gonzalez bc63e8051e Added safe output to conf 2017-09-05 12:51:39 +02:00
daniel 4430a7b2fe fixed errors in autocomplete field 2017-09-05 12:35:21 +02:00
vgilc e04d3186f2 Merge branch '832-pandora-exec-proxy-specs-dev' into 'develop' 
Added specs from MPulido

See merge request !779
 2017-09-05 12:00:23 +02:00
Arturo Gonzalez 4d469426a5 Added specs from MPulido 2017-09-05 11:46:44 +02:00
daniel f954b92aae fixed error in mr for WUX 2017-09-05 11:06:49 +02:00
Daniel Maya b6c44db3cd Merge branch 'develop' into '125-Gestión-recolección-y-correlación-de-logs-dev' 
# Conflicts:
#   pandora_server/lib/PandoraFMS/Config.pm
 2017-09-05 10:00:24 +02:00
artica 924518e02b Auto-updated build strings. 2017-09-05 00:01:21 +02:00
Daniel Maya c6d216df07 update functions_config with Number of logs viewed 2017-09-04 18:00:06 +02:00
Arturo Gonzalez 3a9895b97b Added min size to the field 2017-09-04 16:58:55 +02:00
vgilc 76aa8d8b05 Merge branch '1256-cargarse-todo-rastro-de-ssh-gateway-y-vnc' into 'develop' 
Removed VNC & SSH extensions, go ehorus!

See merge request !774
 2017-09-04 16:39:16 +02:00
vgilc 09f92b51ae Merge branch '832-server-proxy-final-details-dev' into 'develop' 
Added last specifications to pandora exec proxy

See merge request !775
 2017-09-04 16:33:11 +02:00
fbsanchez 629f5aa237 Merge branch 'develop' into 1256-cargarse-todo-rastro-de-ssh-gateway-y-vnc 2017-09-04 16:20:20 +02:00
fbsanchez 6995a81509 Removed all traces of anytermd from code 2017-09-04 16:19:56 +02:00
vgilc 9ba802c506 Merge branch '1097-vulnerabilidad-en-extension-ssh_gateway-php' into 'develop' 
1097 vulnerabilidad en extension ssh gateway php

See merge request !742
 2017-09-04 16:04:45 +02:00
Arturo Gonzalez 018f449fc8 Added last specifications to pandora exec proxy 2017-09-04 16:02:58 +02:00
fbsanchez 5f350bb7ca Merge branch 'develop' into 1256-cargarse-todo-rastro-de-ssh-gateway-y-vnc 2017-09-04 16:01:38 +02:00
daniel a04e02570f Merge branch 'develop' into 1056-pandora-wux-grid-server 2017-09-04 14:09:08 +02:00
daniel f0862e1c5b fixed minor errors in WUX 2017-09-04 12:09:19 +02:00
Arturo Gonzalez 4ebc081855 Added image to planned downtime 2017-09-04 10:26:30 +02:00
Junichi Satoh 5b2eec0b1d Updated Japanese help. 2017-09-04 11:38:32 +09:00
artica 9169cff0b5 Auto-updated build strings. 2017-09-04 00:01:13 +02:00
artica b35ffc84ba Auto-updated build strings. 2017-09-03 00:01:13 +02:00
artica f2cf38a3dd Auto-updated build strings. 2017-09-02 00:01:14 +02:00
fbsanchez ad0bedb4a8 Removed VNC & SSH extensions, go ehorus! 2017-09-01 13:49:23 +02:00
nramon 13894ba403 Merge branch '832-server-proxy-details-dev' into 'develop' 
Added details to agent wizard and secundary servers

See merge request !770
 2017-09-01 11:36:53 +02:00
daniel d74a3f74b4 Merge branch 'develop' into 1056-pandora-wux-grid-server 2017-09-01 10:51:54 +02:00
Arturo Gonzalez a80f62003c Added details to agent wizard and secundary servers 2017-09-01 10:44:26 +02:00
slerena 53e61715a1 Merge branch '1211-Falta-tabla-de-proceso-de-reseteo-de-contraseñas-en-MR' into 'develop' 
Add password reset table in MR - #1211

See merge request !754
 2017-09-01 00:09:39 +02:00
artica cce7f496b6 Auto-updated build strings. 2017-09-01 00:01:14 +02:00
fbsanchez 4d1be92150 DB changes (text => mediumtext) ONLY NEW INSTALLATIONS 2017-08-31 19:14:31 +02:00
Enrique Camargo 6b4a15534d Merge branch 'develop' into '1211-Falta-tabla-de-proceso-de-reseteo-de-contraseñas-en-MR' 
# Conflicts:
#   pandora_console/extras/mr/6.sql
 2017-08-31 18:21:08 +02:00
slerena 601db73596 Merge branch '1177-Graficas_con_valores_negativos_rev2' into 'develop' 
fixed error values negatives in reports pdf

See merge request !769
 2017-08-31 18:16:26 +02:00
slerena ec1b95d45a Merge branch 'Alta-de-nueva-macro-_id_module_-ayuda-1072' into 'develop' 
Add _id_module_ definition to help - #1072

See merge request !757
 2017-08-31 18:07:09 +02:00
Enrique Camargo afd184f466 Update 6.sql 2017-08-31 17:58:34 +02:00
daniel b0263a8806 fixed error values negatives in reports pdf 2017-08-31 16:52:41 +02:00
nramon abccf5c972 Merge branch '1058-large-names-in-service-map-dev' into 'develop' 
Removed unused styles

See merge request !768
 2017-08-31 16:25:07 +02:00
daniel a64e0feba3 fixed minor error view snapshot WUX 2017-08-31 16:13:28 +02:00
Arturo Gonzalez d0715bed51 Removed unused styles 2017-08-31 16:08:24 +02:00
enriquecd ac0820b9b4 change url in preview qr code in agent view - #1229 2017-08-31 15:57:34 +02:00
enriquecd f6c6e2a6ba Add show_statistics option for group item - #1245 2017-08-31 15:09:04 +02:00
nramon a99b75da4c Merge branch '832-add-server-exec-proxy-to-policy-wizard-dev' into 'develop' 
Added db changes to mr 6

See merge request !765
 2017-08-31 11:46:41 +02:00
nramon 83da33a53f Merge branch '137-global-module-search-get-disabled-modules-dev' into 'develop' 
Added condition to query

See merge request !762
 2017-08-31 11:39:17 +02:00
nramon 02bf6dbd5c Merge branch '1058-rework-elements-labels-in-service-map-dev' into 'develop' 
Added styles to service map elements

See merge request !679
 2017-08-31 11:38:21 +02:00
nramon 17201b5dd8 Merge branch '1190-Error-in-module-cascade-selector-dev' into 'develop' 
Do the autocomplete field correct

See merge request !761
 2017-08-31 11:36:44 +02:00
Arturo Gonzalez 2fe8849708 Added db changes to mr 6 2017-08-31 11:33:08 +02:00
Arturo Gonzalez 7b949cb5bf Added function to get all interfaces 2017-08-31 10:09:49 +02:00
artu30 914f09c559 Merge branch 'develop' into '1058-rework-elements-labels-in-service-map-dev' 
# Conflicts:
#   pandora_console/include/styles/pandora.css
 2017-08-31 08:19:00 +02:00
artica e45face2fc Auto-updated build strings. 2017-08-31 00:01:15 +02:00