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

7376 Commits

Author SHA1 Message Date
daniel 571c74d558 fixed error export csv custom graph 2017-08-16 10:16:04 +02:00
artica b0f3a737a9 Auto-updated build strings. 2017-08-16 00:01:15 +02:00
artica a12f0de8b7 Auto-updated build strings. 2017-08-15 00:01:13 +02:00
vgilc 9c32a72c9f Merge branch 'develop' into '1077-sql-error-in-log4x-data-module-dialog-dev' 
# Conflicts:
#   pandora_console/include/functions_modules.php
 2017-08-14 15:26:54 +02:00
Daniel Maya 2f8e8703b7 Fixed 2017-08-14 14:53:56 +02:00
Daniel Maya c3d1d7e397 Xaxisname deleted from xaxes 2017-08-14 12:36:49 +02:00
vgilc aa54f0cc9a Merge branch '1156-Serialize_data_en_metaconsola_no_funciona' into 'develop' 
fixed errors metaconsole reports serialize data

See merge request !712
 2017-08-14 12:24:43 +02:00
vgilc 4d0b360bf8 Merge branch '1112-PopUp-eventos-no-carga-gráfica-de-módulos-con-espacios-dev' into 'develop' 
Fixed urlencode in event popup

See merge request !676
 2017-08-14 12:18:22 +02:00
vgilc f5d161b108 Merge branch '1167-Fallo_en_exportación_a_CSV_de_Custom_Graphs' into 'develop' 
fixed error exportation csv in custom graphs

See merge request !708
 2017-08-14 12:16:47 +02:00
vgilc baf9b6aa5a Merge branch '1173-Campo-label-no-funciona-en-templates-de-informe-en-la-metaconsola-dev' into 'develop' 
Added label in automatic graph

See merge request !706
 2017-08-14 12:13:58 +02:00
artica 8462e9d3d5 Auto-updated build strings. 2017-08-14 00:01:13 +02:00
artica cc7b00bb39 Auto-updated build strings. 2017-08-13 00:01:12 +02:00
artica bc022aba2b Auto-updated build strings. 2017-08-12 00:01:13 +02:00
daniel 33ccab173e fixed errors visual console 2017-08-11 09:13:26 +02:00
artica 941341585e Auto-updated build strings. 2017-08-11 00:01:13 +02:00
daniel 0915e46e4c fixed errors in visual console on simple value 2017-08-10 17:45:00 +02:00
Daniel Maya e1d4a81034 Fixed issue with simple value 2017-08-10 15:45:53 +02:00
artica 8309e4fffb Updated version and build strings. 2017-08-10 10:37:06 +02:00
artica bbe63a30ec Auto-updated build strings. 2017-08-10 00:01:15 +02:00
daniel 1d7d55a451 fixed errors in form wux 2017-08-09 13:27:51 +02:00
daniel 788cb8cbd8 fixed errors in form wux 2017-08-09 12:08:52 +02:00
daniel 7e649b78b3 wux new form 2017-08-09 11:29:16 +02:00
artica f96032eeaa Auto-updated build strings. 2017-08-09 00:01:15 +02:00
artica d5cff43128 Auto-updated build strings. 2017-08-08 00:01:14 +02:00
Daniel Maya 97392c4568 Fixed issue to search agent modules in cascade protection 2017-08-07 13:10:02 +02:00
Daniel Maya 160ad7e866 Fixed Connection failure in ldap 2017-08-07 09:21:26 +02:00
artica 5164624dca Auto-updated build strings. 2017-08-07 00:01:14 +02:00
artica 5a0da66b3d Auto-updated build strings. 2017-08-06 00:01:13 +02:00
artica c826d0951e Auto-updated build strings. 2017-08-05 00:01:13 +02:00
daniel e875ce9b4e fixed errors in update manager open 2017-08-04 14:07:27 +02:00
artica 2d8697eaeb Auto-updated build strings. 2017-08-04 00:01:14 +02:00
daniel c4171ac248 fixed errors metaconsole reports serialize data 2017-08-03 17:09:27 +02:00
Daniel Maya 78d4eb68bc Fixed problem in node 2017-08-03 13:29:18 +02:00
Daniel Maya 0932004781 Fixed label in automatic graph in node 2017-08-03 13:13:34 +02:00
daniel fb9f187287 fixed error exportation csv in custom graphs 2017-08-03 13:09:41 +02:00
Arturo Gonzalez ea06ba213b Added registration method to reset pass 2017-08-03 13:05:57 +02:00
Daniel Maya 362ab94781 Added label in automatic graph 2017-08-03 12:41:47 +02:00
daniel 20fc24b99e allow UNION sql reports 2017-08-03 11:32:43 +02:00
artica 5860d29e37 Auto-updated build strings. 2017-08-03 00:01:15 +02:00
daniel 89b0ec2584 fixed errors in graphs value negative 2017-08-02 16:46:50 +02:00
daniel 14422413a3 add helps in pandora macromodulegraphth 2017-08-02 12:00:26 +02:00
daniel 6e45b3cd9e add threshold graph send for mail 2017-08-02 11:48:37 +02:00
artica 408efec325 Updated version and build strings. 2017-08-02 10:12:45 +02:00
artica c363a2e085 Auto-updated build strings. 2017-08-02 00:01:14 +02:00
Daniel Maya dd5cb8088c added service functions in the API 2017-08-01 10:39:02 +02:00
artica 7e508a4137 Auto-updated build strings. 2017-08-01 00:01:14 +02:00
Arturo Gonzalez d298ba4d40 Center texts 2017-07-31 14:55:38 +02:00
Arturo Gonzalez 4ce9a96b74 Fixed last timestamp in interface charts 2017-07-31 12:50:50 +02:00
vgilc dc462550ef Merge branch 'reset_commit_acl_open' into 'develop' 
Revert "Use session and not exec sql if already exists acl perms in session - #1017"

See merge request !697
 2017-07-31 10:26:40 +02:00
artica 6a4a199c96 Auto-updated build strings. 2017-07-31 00:01:13 +02:00
artica 50c4419ef7 Auto-updated build strings. 2017-07-30 00:01:13 +02:00
artica cc40fcccc2 Auto-updated build strings. 2017-07-29 00:01:14 +02:00
daniel 179325447f Revert "Use session and not exec sql if already exists acl perms in session - #1017" 
This reverts commit 78bb583824.
 2017-07-28 12:46:17 +02:00
artu30 14a439faab Merge branch 'develop' into '618-new-item-auto-sla-graph-in-visual-console-dev' 
# Conflicts:
#   pandora_console/godmode/reporting/visual_console_builder.editor.js
#   pandora_console/include/functions_visual_map_editor.php
#   pandora_console/include/graphs/flot/pandora.flot.js
 2017-07-28 10:30:17 +02:00
vgilc ca43066ce8 Merge branch '1085-Añadir-sección-Description-a-HTML-view-meta-enterprise-open' into 'develop' 
Add report info option in metaconsole 7 open - #1085

See merge request !687
 2017-07-28 10:22:42 +02:00
vgilc 333171c2b6 Merge branch '1124-4288-agrupar-graficas-combinadas-ii_open' into 'develop' 
fixed errors in graph container

See merge request !688
 2017-07-28 10:19:15 +02:00
artica 55c70098ba Auto-updated build strings. 2017-07-28 00:01:13 +02:00
artica 9d6bd697a7 Auto-updated build strings. 2017-07-27 00:01:13 +02:00
artica a9d76e2748 Updated version and build strings. 2017-07-26 17:03:41 +02:00
artica 729503f509 Auto-updated build strings. 2017-07-26 00:01:13 +02:00
Arturo Gonzalez 6b30accd11 Added new function to redirect with dbclick when fictinal have a map link 2017-07-25 15:38:28 +02:00
vgilc a2d15f9f34 Merge branch '1129-new-events-bar-in-metaconsole-dev' into 'develop' 
1129 new events bar in metaconsole dev

See merge request !690
 2017-07-25 10:45:10 +02:00
Arturo Gonzalez 836cc384e9 Added good colours to meta tactical events bar 2017-07-25 08:36:21 +02:00
artica daa952649b Auto-updated build strings. 2017-07-25 00:01:13 +02:00
Arturo Gonzalez 9ddb47741f Added new events bar to meta 2017-07-24 16:34:22 +02:00
daniel 4dfbdca423 add new field table view agents for type of agent 2017-07-24 15:53:31 +02:00
vgilc 5f128ed9ce Merge branch '1087-error-in-events-filter-from-agent-events-graph-dev' into 'develop' 
Fixed events filter from agent events graph

See merge request !655
 2017-07-24 13:20:07 +02:00
daniel 741cc05268 fixed errors in graph container 2017-07-24 10:53:04 +02:00
artica f3d6d7262e Auto-updated build strings. 2017-07-24 00:01:17 +02:00
artica c51cf9774f Auto-updated build strings. 2017-07-23 00:01:13 +02:00
artica b5caec31b5 Auto-updated build strings. 2017-07-22 00:01:45 +02:00
enriquecd 75a9a41a0b Add report info option in metaconsole 7 open - #1085 2017-07-21 14:57:03 +02:00
artica 1d35620ea6 Auto-updated build strings. 2017-07-21 00:01:16 +02:00
enriquecd ef007f8a6f Fix labels - #1088 2017-07-20 15:53:43 +02:00
Enrique Camargo 9cc461ec8b Update functions_reporting.php 2017-07-20 15:23:46 +02:00
enriquecd f88f375ea3 Filter agents by server automatico module graph and fix bug - #1088 2017-07-20 15:14:20 +02:00
vgilc 8971560f5d Merge branch '412-consola-visual-Módulo-imagen-2-size' into 'develop' 
Fix restore element width when press double click over data image simple_value - #412

See merge request !681
 2017-07-20 09:42:31 +02:00
artica 728fb7cc69 Auto-updated build strings. 2017-07-20 00:01:18 +02:00
enriquecd 31a8995176 Fix restore element width when press double click over data image simple_value - #412 2017-07-19 19:02:20 +02:00
Daniel Maya f060a2cdd8 Extended number of characters allowed 2017-07-19 16:12:09 +02:00
Arturo Gonzalez 5baa1ae559 Added styles to service map elements 2017-07-19 15:40:33 +02:00
Daniel Maya 06eadbaf81 Fixed urlencode in event popup 2017-07-19 10:52:01 +02:00
Arturo Gonzalez 1ff3202c43 Added the last things to the new vc item (module events) 2017-07-19 10:36:24 +02:00
vgilc ef0e6a2093 Merge branch '713-Asignar-políticas-a-grupos-dev' into 'develop' 
713 asignar políticas a grupos dev

See merge request !667
 2017-07-19 09:55:10 +02:00
artica b8b6937284 Auto-updated build strings. 2017-07-19 00:01:16 +02:00
vgilc 6dba0a5040 Merge branch 'develop' into '713-Asignar-políticas-a-grupos-dev' 
# Conflicts:
#   pandora_console/extras/mr/4.sql
 2017-07-18 12:24:49 +02:00
Daniel Maya f0e43e252c New feature: Add groups to policies 2017-07-18 12:06:57 +02:00
Arturo Gonzalez e9e10d3a79 Merge branch 'develop' into 618-new-item-auto-sla-graph-in-visual-console-dev 
pandora_console/include/functions_visual_map.php
	pandora_console/include/functions_visual_map_editor.php
 2017-07-18 11:57:13 +02:00
Arturo Gonzalez bec023dc4d Fixed meta event table in cli and api functions 2017-07-18 11:36:57 +02:00
artica d65ad2693e Auto-updated build strings. 2017-07-18 00:01:17 +02:00
vgilc 7dd0e989fa Merge branch '412-consola-visual-Módulo-imagen' into 'develop' 
Add data image option to simple data visual console element - #412

See merge request !584
 2017-07-17 17:03:04 +02:00
vgilc 0bd74d92f0 Merge branch '1040-autorefresh-in-user-section-is-separated-by-user-dev' into 'develop' 
Added refresh by user

See merge request !607
 2017-07-17 10:54:06 +02:00
Enrique Camargo 1e7fbc443e Merge branch 'develop' into '412-consola-visual-Módulo-imagen' 
# Conflicts:
#   pandora_console/godmode/reporting/visual_console_builder.editor.js
 2017-07-17 10:39:20 +02:00
artica 3fb887f516 Auto-updated build strings. 2017-07-17 00:01:15 +02:00
artica c5c748c831 Auto-updated build strings. 2017-07-16 00:01:15 +02:00
artica 8f88f87203 Auto-updated build strings. 2017-07-15 00:01:15 +02:00
artica 65cbbd1bae Auto-updated build strings. 2017-07-14 00:01:19 +02:00
vgilc f8a1b77158 Merge branch '1115-Redimensiónde-los-iconos-y-texto-en-mapas-GIS' into 'develop' 
Hold mark labels font size when autorefresh and fix drag map font size bug - #1115

See merge request !660
 2017-07-13 17:16:49 +02:00
Arturo Gonzalez b4c31df636 Fixed module events graph in vc 2017-07-13 16:57:53 +02:00
Arturo Gonzalez d57508f09e Added sla_auto_graph item to vc first version 2017-07-13 16:23:16 +02:00
Daniel Maya 27077dad6f Resolving conflicts 2017-07-13 15:23:22 +02:00
Arturo Gonzalez 8f2b4fb783 Added more changes to the first version 2017-07-13 13:25:28 +02:00
Arturo Gonzalez 19caa3ebfb Added js image 2017-07-13 12:26:13 +02:00
Enrique Camargo 0ff56b0856 Update openlayers.pandora.js 2017-07-13 12:07:53 +02:00
vgilc 38b42a26a2 Merge branch '845-Mejoras-en-SNMP-Browser-dev' into 'develop' 
845 mejoras en snmp browser dev

See merge request !602
 2017-07-13 12:07:46 +02:00
vgilc fb57ea216e Merge branch '997-Active-SNMP-filters-in-snmp-console-dev' into 'develop' 
Added active filters to snmp console

See merge request !611
 2017-07-13 12:02:39 +02:00
vgilc 3e527dfec4 Merge branch '1003-No-se-muestra-correctamente-el-histórico-de-módulos-log4x-dev' into 'develop' 
Fixed sql error in tagente_datos_log4x

See merge request !576
 2017-07-13 11:50:03 +02:00
vgilc ab1980b5c8 Merge branch '977-change-format-in-module-data-dev' into 'develop' 
Changed format

See merge request !560
 2017-07-13 11:48:26 +02:00
vgilc 5711e3ae75 Merge branch '1017-Re-implementacion-de-ACL-Enterprise-open' into 'develop' 
Use session and not exec sql if already exists acl perms in session - #1017

See merge request !624
 2017-07-13 11:36:13 +02:00
artica b0c2a9e25c Auto-updated build strings. 2017-07-13 00:01:16 +02:00
enriquecd c9219107bf Hold mark labels font size when autorefresh and fix drag map font size bug - #1115 2017-07-12 18:49:39 +02:00
Arturo Gonzalez 63d07e1416 Added more things to new vc item 2017-07-12 13:34:20 +02:00
Arturo Gonzalez 9db5669f16 Added item in button palette with default fields 2017-07-12 11:51:00 +02:00
vgilc f907f3cdb7 Merge branch '1088-Macros-en-automatic-combined-graph-plantillas-de-informes' into 'develop' 
Fix automatic combined graph macros in name and labels - #1088

See merge request !657
 2017-07-12 10:12:45 +02:00
artica 7536b1fd56 Auto-updated build strings. 2017-07-12 00:01:15 +02:00
enriquecd 39fb79bbb4 Fix automatic combined graph macros in name and labels - #1088 2017-07-11 18:22:25 +02:00
Daniel Maya 57f6ad097a update 2017-07-11 10:10:48 +02:00
Arturo Gonzalez 2402141c4f Changed text line 2017-07-11 10:04:26 +02:00
artica 2872686042 Auto-updated build strings. 2017-07-11 00:01:16 +02:00
Arturo Gonzalez 1b766f8ce2 Fixed events filter from agent events graph 2017-07-10 16:22:41 +02:00
artica ede763cecf Updated version and build strings. 2017-07-10 15:11:14 +02:00
Arturo Gonzalez d0bd0b3a3b Changed field in sql request 2017-07-10 12:46:02 +02:00
artica 7002f24586 Auto-updated build strings. 2017-07-10 00:01:15 +02:00
artica 6fff54b0f0 Auto-updated build strings. 2017-07-09 00:01:15 +02:00
artica f1520483fd Auto-updated build strings. 2017-07-08 00:01:21 +02:00
Arturo Gonzalez a9ca7b6a8d Added a virgensita de guadalupe fix to generate networkmaps in windows systems 2017-07-07 13:21:05 +02:00
vgilc c19aaa1d64 Merge branch '151-actualizar-el-cliente-de-ehorus' into 'develop' 
Replaced references to switch.ehorus.com with portal.ehorus.com.

See merge request !647
 2017-07-07 11:05:25 +02:00
vgilc 35d722a13f Merge branch 'upload-new-ehorus-bundle' into 'develop' 
Upload new ehorus buldle

See merge request !633
 2017-07-07 10:52:57 +02:00
vgilc e49c2351ae Merge branch '1075-Operaciones-masivas-ponen-postprocess-a-0-dev' into 'develop' 
Fixed post process in Edit modules in bulk

See merge request !638
 2017-07-07 09:38:48 +02:00
vgilc 3c2ef0ea2c Merge branch '155-4248-calculo-dinamico-de-umbrales-en-tipos-booleanos-sla-disponibilidad' into 'develop' 
Fixes boolean modules threshold calc

Closes #155

See merge request !646
 2017-07-07 09:37:37 +02:00
artica 60e92e759b Auto-updated build strings. 2017-07-07 00:01:19 +02:00
fbsanchez ff6173ae54 Fixes boolean modules threshold calc 2017-07-06 14:10:08 +02:00
artica 872e36672c Auto-updated build strings. 2017-07-06 00:01:16 +02:00
vgilc cbc813a3a5 Merge branch '975-fixed-windows-graphviz-bin-path-conf-value-dev' into 'develop' 
Fixed conf field

See merge request !629
 2017-07-05 12:01:46 +02:00
vgilc 0fd6d38a6b Merge branch '853-Custom-SQL-que-afecten-a-BDD-de-histórico-enterprise-open' into 'develop' 
Add historical db check to reports template SQL items - #853

See merge request !640
 2017-07-05 11:45:18 +02:00
vgilc 6cc4e1756a Merge branch '1025-problems-with-charts-when-have-history-db-data-dev' into 'develop' 
Added changes to resolve bad history database data

See merge request !643
 2017-07-05 11:42:15 +02:00
artica 7e376fc6dd Auto-updated build strings. 2017-07-05 00:01:15 +02:00
artica 2fef8a39dd Auto-updated build strings. 2017-07-04 00:01:16 +02:00
Arturo Gonzalez b282063325 Added changes to resolve bad history database data 2017-07-03 15:09:31 +02:00
enriquecd e6e993538b Add historical db check to reports template SQL items - #853 2017-07-03 10:38:04 +02:00
artica acbe200f90 Auto-updated build strings. 2017-07-03 00:01:16 +02:00
artica ef6cf3d5d7 Auto-updated build strings. 2017-07-02 00:01:15 +02:00
artica 83fef400ae Auto-updated build strings. 2017-07-01 00:01:18 +02:00
Ramon Novoa 9a85c47f9e Replaced references to switch.ehorus.com with portal.ehorus.com. 2017-06-30 21:14:55 +02:00
Daniel Maya cfc7050bab Fixed post process in Edit modules in bulk 2017-06-30 14:18:23 +02:00
artica 5eb53d599a Auto-updated build strings. 2017-06-30 00:01:18 +02:00
m-lopez-f 25ede84c47 Upload new ehorus buldle 2017-06-29 16:10:25 +02:00
nramon 031ff3f6d2 Merge branch '310-Mejoras_pandora_revent_para_TMB_rev' into 'develop' 
fixed autovalidate event in pandora_revent with extra_id

See merge request !621
 2017-06-29 09:15:39 +02:00
nramon 5669c1b1a0 Merge branch '874_Anadir_posibilidad_de_ver_todos_los_eventos_rev' into 'develop' 
fixed minor error

See merge request !628
 2017-06-29 09:15:24 +02:00
artica 470ff1857b Auto-updated build strings. 2017-06-29 00:01:17 +02:00