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

10505 Commits

Author SHA1 Message Date
Arturo Gonzalez bcf1fc2e1b Merge db system. Ticket #444 2017-03-03 10:27:52 +01:00
fermin831 5d085c008d Added json_disabled icon 2017-03-03 10:23:46 +01:00
Ramon Novoa 540d076c9f Merge branch 'develop' into feature#new-iface-names 2017-03-03 08:32:31 +01:00
Junichi Satoh 17015c4afc Fixed syntax error. 2017-03-03 16:05:58 +09:00
artica 5e1b14a75a Auto-updated build strings. 2017-03-03 00:01:30 +01:00
fermin831 0ce0d7a61c Fixed height on module graph when no resize is needed 2017-03-02 18:49:37 +01:00
daniel ee932946cc fixed errors dynamic threshold+ 2017-03-02 18:22:42 +01:00
daniel 2f0df9a996 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 2017-03-02 16:40:41 +01:00
daniel a182f3f102 fixed errors in dynamic threshold 2017-03-02 16:37:49 +01:00
fermin831 31ea5bf5ec Added Time lapse in #434 2017-03-02 16:37:28 +01:00
Daniel Maya 220e27b224 Fixed agents when changing groups 2017-03-02 16:14:42 +01:00
m-lopez-f 99c176daf8 Fixed problems with graphs when using visual console maps and pure vision. 2017-03-02 15:50:05 +01:00
Arturo Gonzalez 217cffbf05 Merge um packages system. Ticket #439 2017-03-02 15:45:27 +01:00
daniel ff3d8ca07f fixed error graph in report network_interfaces 2017-03-02 13:35:11 +01:00
m-lopez-f 4e6fdf7b15 Fixed change/delete or added permmisions when active AD o AD advanced method login and using a metaconsole version. Gitlab: #379 2017-03-02 13:23:01 +01:00
fermin831 9883be0302 Deleted graph name on projection graphs 2017-03-02 13:18:13 +01:00
Daniel Maya 3666ab9745 Changed name by alias in event list 2017-03-02 12:50:42 +01:00
daniel 2ec84d8c61 truncate name and description for report 2017-03-02 12:14:19 +01:00
daniel 4ef8cd3234 fixed errors in visual consele meta 2017-03-02 11:23:09 +01:00
fermin831 c8ebcafc13 Fixed monitor report (using reporting_advanced_sla function) 2017-03-02 11:12:19 +01:00
Arturo Gonzalez 86e8e7fc1c Fixed module type order field in agent view. Ticket #392 2017-03-02 10:59:58 +01:00
Arturo Gonzalez c527aa243b Fixed font size reduction in graphs. Ticket #411 2017-03-02 09:35:28 +01:00
Ramon Novoa 12d3c1722b Merge branch 'develop' into feature#new-iface-names 2017-03-02 08:18:19 +01:00
Ramon Novoa 6f8452f10f Apply Aoyagi's second patch. 2017-03-02 07:59:13 +01:00
artica 01784bd083 Auto-updated build strings. 2017-03-02 00:01:16 +01:00
enriquecd b6bcf07843 Fix main visual console creator and updater when select images - #77 2017-03-01 20:05:22 +01:00
enriquecd 2ca6783278 Align home screen and skin inputs in user editor - #82 2017-03-01 16:36:36 +01:00
Arturo Gonzalez cf27aae8cc Reorder module ordenation by status. Ticket #394 2017-03-01 16:02:35 +01:00
artica 8ab66f6d64 Updated version and build strings for the NG BETA release. 2017-03-01 16:01:27 +01:00
fermin831 ec515db179 Fixed get module_data to get url_encode_separator 2017-03-01 15:30:40 +01:00
artica 02332570de Revert "Updated version and build strings." 
This reverts commit 8867a17baf.
 2017-03-01 15:25:58 +01:00
artica 8867a17baf Updated version and build strings. 2017-03-01 15:25:30 +01:00
daniel ab56ffda93 fixed minor error in report availability 2017-03-01 15:20:41 +01:00
daniel 7d244d4593 fixed minor error in custom graphs 2017-03-01 15:10:24 +01:00
Ramon Novoa 47e17630d1 Merge branch 'develop' into feature#new-iface-names 2017-03-01 15:00:44 +01:00
daniel 99bf29b667 fised errors in graph 2017-03-01 14:59:37 +01:00
Ramon Novoa 936ae0b4cd Apply Aoyagi's patch. 2017-03-01 12:34:32 +01:00
Ramon Novoa 225147770d Merge branch 'develop' into feature#new-iface-names 2017-03-01 12:18:09 +01:00
Arturo Gonzalez 44724e648d Fixed graphs in reports. Ticket #411 2017-03-01 12:10:01 +01:00
fermin831 8e0dd33c85 Added version to disabled extensions 2017-03-01 11:52:56 +01:00
daniel 5faf2fdaef merge develop in new_ifaces_name 2017-03-01 11:47:38 +01:00
Arturo Gonzalez 8bae65b4a2 Fixed gis map agents name when refresh map. Ticket #395 2017-03-01 09:20:28 +01:00
fermin 62bdfbf4f8 Merge branch 'ent-312-filtros-activos-en-vista-de-eventos' into 'develop' 
Ent 312 filtros activos en vista de eventos

See merge request !219
 2017-03-01 08:36:44 +01:00
m-lopez-f 80edd82cf4 Fixed graphs in visual console and dashboards. Ticket: #374 2017-03-01 08:26:10 +01:00
artica 8d092ef24d Auto-updated build strings. 2017-03-01 00:01:17 +01:00
fermin831 19fab5d96b Added loaded filter name to active filters view 2017-02-28 19:27:40 +01:00
fermin831 9354e845f7 Changed some icons 2017-02-28 19:17:38 +01:00
daniel 909637c1f8 add pdf to report interfaces 2017-02-28 18:06:23 +01:00
fermin831 cce99cb46b Added active events filter view meta (enterprise part) 2017-02-28 17:43:39 +01:00
fermin831 4ae8963e2e Added events active filter view (open side) 2017-02-28 15:41:03 +01:00
enriquecd 7034f7afc6 Check interval filter agents without modules and disabled modules - #74 2017-02-28 14:29:05 +01:00
Arturo Gonzalez 24ef7a1e11 Languages updated. Ticket #371 2017-02-28 14:03:42 +01:00
Arturo Gonzalez 2d3d82001e Fixed some things to networkmaps. Ticket #406 2017-02-28 12:51:24 +01:00
daniel 5a79f83bba feature change name interfaces 2017-02-28 12:42:50 +01:00
Enrique Camargo 32a52ff4e0 Merge branch '66-pequenos-arreglos-en-interfaz-de-creacion-de-graficas-combinadas-3' into 'develop' 
Improve custom graph interface / 3 - #66

See merge request !215
 2017-02-28 12:42:44 +01:00
enriquecd 43572bd93c Improve custom graph interface / 3 - #66 2017-02-28 12:27:01 +01:00
m-lopez-f d83981ef5d Fixed values and graphs in visual consoles. 2017-02-28 12:25:06 +01:00
m-lopez-f 0dd770a551 Fixed problems with visual maps in dashboards view. Gitlab: #374 2017-02-28 10:49:12 +01:00
Arturo Gonzalez 4d89b6496f Min value always must be 0 in y axis. Ticket #345 2017-02-28 08:52:47 +01:00
artica 19dcc729da Auto-updated build strings. 2017-02-28 00:01:17 +01:00
Daniel Maya 811dc3ba8f Added alias when group changed 2017-02-27 17:41:46 +01:00
Daniel Maya c1d22dad1b Change in pandora link 2017-02-27 17:23:02 +01:00
daniel 8f8a17bf24 fixed alias for name in reports 2017-02-27 16:48:28 +01:00
Daniel Maya 742f487d72 Change to alias in treeview 2017-02-27 15:06:24 +01:00
Arturo Gonzalez 938dc40f77 Fixed api get module data. Ticket #385 2017-02-27 14:58:40 +01:00
Enrique Camargo b2489e90aa Merge branch '81-resaltar-objetos-en-consola' into 'develop' 
Change background color when mouse over rows in agent and module managers - #81

See merge request !212
 2017-02-27 14:38:12 +01:00
enriquecd 983d00535a Change background color when mouse over rows in agent and module managers - #81 2017-02-27 14:28:09 +01:00
Arturo Gonzalez 7ffe4988f0 Added new fields to log report. Ticket #337 2017-02-27 14:04:49 +01:00
Enrique Camargo b0bdcbb3e9 Merge branch '80-pandora-en-windows-no-muestra-la-hora-en-el-footer' into 'develop' 
Change data function to show in footer windows compatible - #80

See merge request !208
 2017-02-27 12:36:53 +01:00
Enrique Camargo cf1cb00e21 Merge branch '77-bug-en-fondo-de-consolas-visuales-pandora-7-3' into 'develop' 
Filter create or update visual console, not let background size smaller than 1024x768 - #77

See merge request !207
 2017-02-27 12:05:36 +01:00
enriquecd ca97686b25 Change data function to show in footer windows compatible - #80 2017-02-27 12:00:28 +01:00
enriquecd 2c8c2dceb7 Filter create or update visual console, not let background size smaller than 1024x768 - #77 2017-02-27 11:27:40 +01:00
m-lopez-f 070db42c41 Add default value of field advance ad configuration. Gitlab: #367 2017-02-27 11:26:48 +01:00
Arturo Gonzalez fc7e2f69b7 Fixed exception in datetime object. Functions api get_module_data. Ticket #378 2017-02-27 11:05:23 +01:00
Daniel Maya 0e1cd281f0 Added alias to agent search 2017-02-27 10:52:59 +01:00
Arturo Gonzalez 19d79a73de Fixed data editor in reports. Ticket #337 2017-02-27 09:48:57 +01:00
Junichi Satoh 023f4b1703 Fixed setcookie() usage. 2017-02-27 13:45:45 +09:00
artica 163b061af0 Auto-updated build strings. 2017-02-27 00:01:16 +01:00
artica ef50808832 Auto-updated build strings. 2017-02-26 00:01:15 +01:00
artica 4d6e26a496 Auto-updated build strings. 2017-02-25 00:01:17 +01:00
daniel 45ea30e5b3 fixed nome agent for alias agent 2017-02-24 13:59:03 +01:00
Daniel Maya 0e1c62e644 Changed agent search 2017-02-24 13:41:59 +01:00
artica 62ab9f0a55 Auto-updated build strings. 2017-02-24 00:01:16 +01:00
enriquecd 8be1475555 77-bug-en-fondo-de-consolas-visuales-pandora-7-2 - #77 2017-02-23 17:13:50 +01:00
m-lopez-f f03dece0eb Fixed problems with imges scr in visual console setup. Gitlab: #255 2017-02-23 13:04:36 +01:00
Alejandro Gallardo Escobar 2f3053ebbd Changed the agent name by its alias and fixed the exception reporting item 2017-02-23 12:59:24 +01:00
m-lopez-f 289549a49f Merge branch 'develop' of https://192.168.50.5:8081/artica/pandorafms into develop 2017-02-23 12:26:56 +01:00
m-lopez-f 45316cdd0f Fixed visual in welcome view. Gitlab: #359 2017-02-23 12:26:48 +01:00
daniel a0ace09e01 fixed url img in metaconsole 2017-02-23 12:02:02 +01:00
m-lopez-f 8050f063cb Fixed problems with export data in csv on graphs when have percentil active. Gitlab: #358 2017-02-23 10:55:38 +01:00
Enrique Camargo 9bdfc386f3 Merge branch '75-etiquetas-de-vista-de-agente' into 'develop' 
Add not init status count label y agent detail section - #75

See merge request !199
 2017-02-23 10:15:29 +01:00
enriquecd fe8a43d045 Add not init status count label y agent detail section - #75 2017-02-23 10:05:03 +01:00
daniel 7609e85d3e fixed errors in tab menu 2017-02-23 09:23:27 +01:00
m-lopez-f 30baabafeb Fixed problems with output data in netflow, change max view data. Gitlab: #333 2017-02-23 09:05:11 +01:00
artica 39e380097b Auto-updated build strings. 2017-02-23 00:01:18 +01:00
fermin831 57291788e8 Added a Extension Manager View like a submenu 2017-02-22 18:13:24 +01:00
Enrique Camargo e34b3ea1e4 Merge branch '77-bug-en-fondo-de-consolas-visuales-pandora-7' into 'develop' 
Convert to array values revieved by ajax for updatedb - #77

See merge request !197
 2017-02-22 17:55:34 +01:00
enriquecd 817bce5f4c Convert to array values revieved by ajax for updatedb - #77 2017-02-22 17:41:19 +01:00
daniel 0169aaa129 add new field tagent in oracle 2017-02-22 17:30:31 +01:00
Daniel Maya a1978e93b1 Inserted alias in pandora audit 2017-02-22 16:52:42 +01:00
Alejandro Gallardo Escobar 3d8af42834 Changed the agent name by its alias 2017-02-22 16:43:28 +01:00
m-lopez-f b184a75065 Fixed styles in visual setup administration. Gitlab: #360 2017-02-22 14:12:33 +01:00
Alejandro Gallardo Escobar beb38c70ce Changed the agent name by its alias in the mobile console 2017-02-22 13:50:06 +01:00
m-lopez-f dc6c024611 Merge branch 'develop' of https://192.168.50.5:8081/artica/pandorafms into develop 2017-02-22 13:48:19 +01:00
m-lopez-f 1e4d784e72 Remove text from header and only indicated name of networkmap or agents. Gitlab: #353 2017-02-22 13:48:11 +01:00
daniel 83af8bd639 fixed visual errors edit modules 2017-02-22 13:18:56 +01:00
m-lopez-f 724b2e469d Merge branch 'develop' of https://192.168.50.5:8081/artica/pandorafms into develop 2017-02-22 13:08:47 +01:00
m-lopez-f 015890a18a Fixed problems with duplicade color in netflow graphs. Gitlab: #346 2017-02-22 13:08:39 +01:00
Alejandro Gallardo Escobar 3d521ec290 Changed the agent name by its alias in some sections 2017-02-22 12:51:55 +01:00
Alejandro Gallardo Escobar c26eb06adb Now the function to print the agent name prints the alias by default. This behaviour can be modified by changing a parameter 2017-02-22 12:51:55 +01:00
Arturo Gonzalez fb8f05808e Fixed bad text in pandora performance. Ticket #233 2017-02-22 12:48:35 +01:00
Arturo Gonzalez 83776e46d1 Changed some texts in pandora. Ticket #347 2017-02-22 12:36:30 +01:00
Daniel Maya 51f78e5a8a Merge branch 'develop' of https://192.168.50.5:8081/artica/pandorafms into develop 2017-02-22 11:47:07 +01:00
Daniel Maya b9b26c4543 Change in name hash 2017-02-22 11:46:54 +01:00
enriquecd 454a799c3d Change count column label text in agent detail section - #75 2017-02-22 11:36:29 +01:00
m-lopez-f bfe40653df REmove debug trace. Gitlab: #346 2017-02-22 11:15:05 +01:00
daniel f351a95993 fixed errors in tabs reports 2017-02-22 09:21:35 +01:00
artica 54d228c00e Auto-updated build strings. 2017-02-22 00:01:20 +01:00
Alejandro Gallardo Escobar 6fc884d327 Changed the agent name by its alias in the events sections 2017-02-21 19:07:17 +01:00
Enrique Camargo 1e88c6d457 Merge branch '74-muestra-last-contact-en-rojo-no-deberia' into 'develop' 
Functions_module now not use async modules to calc if last contact is major than…

See merge request !190
 2017-02-21 18:59:14 +01:00
fermin831 d16138c68e Modified GIS Maps to print OpenMaps on empty google license 2017-02-21 18:48:50 +01:00
enriquecd 63c112a628 Functions_module now not use async modules to calc if last contact is major than minimum module interval - #74 2017-02-21 18:45:44 +01:00
daniel bf29d4c5f9 fixed error in view agent/module 2017-02-21 17:21:10 +01:00
Arturo Gonzalez 5db7f93b53 Removed header bar in wellcome menu. Ticket #335 2017-02-21 16:54:53 +01:00
m-lopez-f 5bb39c4618 Fixed problems with percentil in customs graphs. Gitlab: #326 2017-02-21 16:52:56 +01:00
Daniel Maya a36e74990d Merge branch 'feature/alias_friendly_name' into 'develop' 
Feature/alias friendly name

See merge request !188
 2017-02-21 16:46:05 +01:00
Arturo Gonzalez cb7ab827d2 Fixed module type chart selected in conf. Ticket #345 2017-02-21 16:36:46 +01:00
daniel 63d582586b Merge branch '68-creacion-de-usuarios-en-ldap-falla' into 'develop' 
fixed error in ldap create new users

See merge request !186
 2017-02-21 15:55:51 +01:00
daniel e4fbef9e47 Merge branch '67-elementos-mal-colocados-en-informe-de-disponibilidad-integria-4155' into 'develop' 
fixed minor error in report availavility

See merge request !185
 2017-02-21 15:39:08 +01:00
Daniel Maya c21bbfd88c Merge branch 'feature/alias_friendly_name' of https://192.168.50.5:8081/artica/pandorafms into feature/alias_friendly_name 2017-02-21 15:31:45 +01:00
Daniel Maya 76cb61f288 Changes for the merge 2017-02-21 15:31:20 +01:00
Alejandro Gallardo Escobar 430ae3e201 Merge branch 'develop' into feature/alias_friendly_name 
Conflicts:
	pandora_console/include/functions_ui.php
 2017-02-21 15:23:44 +01:00
m-lopez-f e5fba88137 fixed visual on movile version. gitlab: #340 2017-02-21 14:27:06 +01:00
daniel a5055ec27a fixed error in ldap create new users 2017-02-21 14:04:53 +01:00
Alejandro Gallardo Escobar 0daaa9651e Changed the agent name by its alias 2017-02-21 14:04:43 +01:00
daniel df0a6086c4 fixed minor error in report availavility 2017-02-21 13:56:00 +01:00
m-lopez-f 2abff60380 Fixed code 2017-02-21 13:30:53 +01:00
Enrique Camargo 31d7091ce7 Merge branch '62-meter-un-salto-de-linea-entre-las-opciones-modules-first-y-agents-firsts-de-forma-que-se-anineen-bien' into 'develop' 
Resolve "Meter un salto de linea entre las opciones "modules first" y "agents firsts" de forma que se anineen bien"

See merge request !180
 2017-02-21 13:06:56 +01:00
m-lopez-f a242395af0 Replace label definition and add help tip in custom reports items. Gitlab: #248 2017-02-21 13:01:34 +01:00
enriquecd 26627e0613 Merge branch '62-meter-un-salto-de-linea-entre-las-opciones-modules-first-y-agents-firsts-de-forma-que-se-anineen-bien' of https://192.168.50.5:8081/artica/pandorafms into 62-meter-un-salto-de-linea-entre-las-opciones-modules-first-y-agents-firsts-de-forma-que-se-anineen-bien 2017-02-21 12:54:48 +01:00
enriquecd 5dbca6eeca Insert newline between module first and agent first in module massive op /2 - #62 2017-02-21 12:52:48 +01:00
Enrique Camargo 32806a5538 Merge branch '66-pequenos-arreglos-en-interfaz-de-creacion-de-graficas-combinadas' into 'develop' 
Improve custom graph interface - #66

See merge request !179
 2017-02-21 12:39:01 +01:00
enriquecd 48a04d6c47 Improve custom graph interface - #66 2017-02-21 12:18:18 +01:00
artu30 c9e89921d2 Merge branch 'feature/log_in_reports' into 'develop' 
Feature/log in reports

See merge request !178
 2017-02-21 12:15:34 +01:00
m-lopez-f 3b97095fda Fixed problems with check discard unknown events in module configuration. Integria: #4242, Gitlab: #324 2017-02-21 12:09:07 +01:00
Arturo Gonzalez 5190228010 Merge branch 'develop' into feature/log_in_reports 
Conflicts:
	pandora_console/godmode/reporting/reporting_builder.item_editor.php
	pandora_console/include/functions_reporting_html.php
 2017-02-21 12:06:24 +01:00
m-lopez-f 09e1b8ce1c Fixed problems with src images in visual consoles. Gitlab: #255 2017-02-21 10:28:19 +01:00
fermin 59135bb1b1 Merge branch '65-la-version-del-cliente-de-ehorus-es-vieja-hablar-con-fermin' into 'develop' 
Updated eHorus client

See merge request !176
 2017-02-21 10:23:29 +01:00
Alejandro Gallardo Escobar e7df5ebacb Merge branch 'develop' into feature/alias_friendly_name 2017-02-21 10:12:35 +01:00
m-lopez-f 8a1bdf5017 Fixed problems with login that this user not have a administration permissions. Gitlab #323 2017-02-21 09:47:42 +01:00