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

10640 Commits

Author SHA1 Message Date
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
artica 028e5c60d2 Auto-updated build strings. 2017-02-21 00:01:17 +01:00
Alejandro Gallardo Escobar 51955d5bea Changed the agent name by its alias 2017-02-20 20:02:39 +01:00
Alejandro Gallardo Escobar 58617c00aa Merge branch 'develop' into feature/alias_friendly_name 2017-02-20 18:52:18 +01:00
Alejandro Gallardo Escobar e53d75d98d Added a function to get the agent alias using a module id 2017-02-20 18:50:28 +01:00
fermin831 7592bce0a9 Updated eHorus client 2017-02-20 18:25:46 +01:00
Alejandro Gallardo Escobar 354377a56a Changed the agent name by its alias 2017-02-20 17:28:38 +01:00
daniel 5c32d0ba95 Merge branch '267-vista-agente-modulo-con-filtros-no-visualiza-datos-open' into 'develop' 
fixed errors in agent/module

See merge request !175
 2017-02-20 17:26:14 +01:00
Arturo Gonzalez 03f2250ffa Removed weird alerts in networkmap. 2017-02-20 16:35:32 +01:00
daniel 65047c23a5 fixed errors in agent/module 2017-02-20 16:16:53 +01:00
Alejandro Gallardo Escobar 550a00cec7 Changed the agent name by its alias 2017-02-20 15:32:49 +01:00
Alejandro Gallardo Escobar c49df7c60d Added a function to get the agent alias 2017-02-20 15:32:10 +01:00
Arturo Gonzalez 4a6cdf822d Fixed modules lejend in agent view. Ticket #294 2017-02-20 15:02:01 +01:00
m-lopez-f 2c1e43a477 Re-fixed problems with agents name in visual consoles 2017-02-20 14:38:58 +01:00
m-lopez-f ca8ec686ac Fixed problems with upload images and show images in created visual consoles. Gitlab: #314 2017-02-20 13:54:34 +01:00
m-lopez-f 3ffe8ae49f Merge branch 'develop' of https://192.168.50.5:8081/artica/pandorafms into develop 2017-02-20 12:56:38 +01:00
m-lopez-f 9a3e693137 Fixed problems with change size of visual console when this size is very small. 
And add message when this size is very small.
 2017-02-20 12:56:29 +01:00
Arturo Gonzalez e8a765876b Fixed multiple delete button and form structure in messages section. Ticket #301 2017-02-20 12:53:53 +01:00
Arturo Gonzalez 651e7ea8e6 Changed migration file name. Ticket #297 2017-02-20 12:35:52 +01:00
enriquecd b915a1034b Not limit 300px agent and module comboboxes in graph builder - #40 2017-02-20 12:06:30 +01:00
Alejandro Gallardo Escobar 545dad643c XMerge branch 'develop' into feature/alias_friendly_name 2017-02-20 12:04:43 +01:00
daniel 4b8808c93d Merge branch '64-detalles-visuales-a-mejorar-sobre-la-interfaz-de-las-graficas' into 'develop' 
fixed errors in graphs

See merge request !172
 2017-02-20 11:23:57 +01:00
Arturo Gonzalez 58ea653e05 Fixed multiple delete in events filter. Ticket #303 2017-02-20 11:20:59 +01:00
daniel 40ee2cce0a fixed errors in graphs 2017-02-20 11:13:47 +01:00
Arturo Gonzalez f9eb762951 Changed license url and update url. Ticket #299 2017-02-20 10:32:07 +01:00
artica f7fd67ca79 Auto-updated build strings. 2017-02-20 00:01:14 +01:00
artica 2d26efe942 Auto-updated build strings. 2017-02-19 00:01:14 +01:00
artica 1021655e43 Auto-updated build strings. 2017-02-18 00:01:16 +01:00
m-lopez-f e3c3fafa43 Fixed problems with agent name in visual consoles. Gitlab #257 2017-02-17 15:39:28 +01:00
m-lopez-f 699942eef5 Merge branch 'develop' of https://192.168.50.5:8081/artica/pandorafms into develop 2017-02-17 13:34:39 +01:00
m-lopez-f e118729398 Fixed problems with column 'last contact'. Gitlab: #269 2017-02-17 13:34:30 +01:00
Enrique Camargo 8ad2c2f35f Merge branch '63-la-consola-visual-en-pantalla-completa-se-come-un-trozo-por-arriba' into 'develop' 
Visual console in fullscreen does not allow see complete background if is bigger than screen - #63

See merge request !168
 2017-02-17 13:23:43 +01:00
Arturo Gonzalez 294cb5a14f Revert "Added data precision to events table. Ticket #288" 
This reverts commit f6f5d64d32.
 2017-02-17 13:15:28 +01:00
enriquecd d7b24fc9c9 Visual console in fullscreen does not allow see complete background if is bigger than screen - #63 2017-02-17 13:04:21 +01:00
Arturo Gonzalez f02827d235 Changed field type in db to get negative numbers. Ticket #120 2017-02-17 12:43:12 +01:00
Enrique Camargo 8bc12f02d0 Merge branch '62-meter-un-salto-de-linea-entre-las-opciones-modules-first-y-agents-firsts-de-forma-que-se-anineen-bien' into 'develop' 
Insert newline between module first and agent first in module massive op - #62

See merge request !166
 2017-02-17 12:24:21 +01:00
Arturo Gonzalez f6f5d64d32 Added data precision to events table. Ticket #288 2017-02-17 12:16:33 +01:00
enriquecd 87e8088c92 Insert newline between module first and agent first in module massive op - #62 2017-02-17 12:08:07 +01:00
Ramon Novoa fb36235e6f Update a URL to point to updatemanager7. 2017-02-17 11:57:05 +01:00
Arturo Gonzalez 7452fe5dda Added missing value in tagente. 2017-02-17 11:06:21 +01:00
Daniel Maya 3051ce4e23 Merge branch 'develop' into feature/alias_freandly_name 
Conflicts:
	pandora_console/include/functions_ui.php
 2017-02-17 10:11:59 +01:00
artica 0677a62be0 Auto-updated build strings. 2017-02-17 00:01:17 +01:00
enriquecd c8c79e6fec Add session_time column to tusuario table - #61 2017-02-16 17:33:17 +01:00
daniel b24b648151 fixed minor errors in tab reports 2017-02-16 16:16:45 +01:00
Daniel Maya d39b108c1f Merge branch 'develop' into feature/alias_freandly_name 
Conflicts:
	pandora_agents/unix/pandora_agent
	pandora_console/extras/pandoradb_migrate_6.0_to_6.1.mysql.sql
	pandora_console/extras/pandoradb_migrate_6.0_to_6.1.oracle.sql
	pandora_console/godmode/agentes/agent_manager.php
	pandora_console/godmode/agentes/modificar_agente.php
	pandora_console/godmode/agentes/planned_downtime.editor.php
	pandora_console/godmode/massive/massive_delete_modules.php
	pandora_console/godmode/massive/massive_edit_modules.php
	pandora_console/include/class/Tree.class.php
	pandora_console/include/functions_graph.php
	pandora_console/include/functions_treeview.php
	pandora_console/include/functions_ui.php
	pandora_console/operation/agentes/estado_agente.php
	pandora_console/operation/agentes/status_monitor.php
	pandora_console/pandoradb.sql
 2017-02-16 16:05:21 +01:00
Arturo Gonzalez 66cd74abbe Removed top blank space in visual console. Ticket #274 2017-02-16 15:55:08 +01:00
daniel cfb7a3a88e fixed tabs in reports 2017-02-16 15:40:56 +01:00
daniel 8e8b9a12c1 Merge branch '57-bug-en-interfaz-de-base-de-datos' into 'develop' 
fixed error in dbmanager

See merge request !161
 2017-02-16 15:15:12 +01:00
Arturo Gonzalez 928689ef3b Added some modifications in networkmaps fonts. Ticket #270 2017-02-16 15:05:44 +01:00
daniel c7fce2d670 fixed error in dbmanager 2017-02-16 15:02:36 +01:00
fbsanchez 27744031ce Fixed thresholds SLA 
fixed dynamic calculation while the thresholds are disabled.
 2017-02-16 12:29:31 +01:00
fbsanchez 9ddee676b6 Minor fix: inherit mysqli from config 2017-02-16 11:35:26 +01:00
daniel d0faeb3ec1 fixed errors in graphs 2017-02-16 11:18:42 +01:00
Junichi Satoh fdb19d309d Updated japanese translations. 2017-02-16 18:22:30 +09:00
fbsanchez 8a2bd0f087 Fixed mysqli availability checker 2017-02-16 10:18:08 +01:00
Arturo Gonzalez 8dbd12eac7 Changed default value to service label font size. Ticket #218 2017-02-16 10:09:05 +01:00
Arturo Gonzalez 24defd473d Fixed grid position problem in visual consoles. Ticket #256 2017-02-16 09:57:58 +01:00
m-lopez-f 71bfbf76d9 Merge branch 'develop' of https://192.168.50.5:8081/artica/pandorafms into develop 2017-02-16 08:38:27 +01:00
m-lopez-f 483c64a888 Add lost updates of files in mobile version #148 2017-02-16 08:37:36 +01:00
artica 96b160adc2 Auto-updated build strings. 2017-02-16 00:01:14 +01:00
nramon 165b59656e Merge branch 'develop' into '253-bit-de-licencia-ux-para-pandora-7' 
# Conflicts:
#   pandora_console/extras/pandoradb_migrate_6.0_to_6.1.mysql.sql
#   pandora_console/extras/pandoradb_migrate_6.0_to_6.1.oracle.sql
 2017-02-15 15:49:16 +01:00
Ramon Novoa de392d26ad Update the Update Manager URLs. 2017-02-15 15:41:54 +01:00
m-lopez-f 68bdcdd74f Fixed typo error 2017-02-15 13:43:15 +01:00
m-lopez-f b43f2cb433 Merge branch 'develop' of https://192.168.50.5:8081/artica/pandorafms into develop 2017-02-15 13:42:48 +01:00
m-lopez-f af65ec1910 Disable default extension Matrix, Vna and SSH. Gitlab: #251, #259 2017-02-15 13:42:40 +01:00
Arturo Gonzalez 5cce7ac2d0 Fixed interface links editor in networkmaps. Ticket #260 2017-02-15 10:29:45 +01:00
daniel cb8fea7f2e fixed minor errors warnings in log 2017-02-15 08:52:57 +01:00
artica 7e7713ae04 Auto-updated build strings. 2017-02-15 00:01:14 +01:00
daniel fb4cc26193 fixed minor errors and no show warnning in console to create agent groups 2017-02-14 15:47:12 +01:00
Arturo Gonzalez c6dbf7c3b5 Added some modifications to node links. Ticket #260 2017-02-14 12:40:57 +01:00
Arturo Gonzalez 0c4f90d252 Node details improvements. Ticket #78 References ticket(s): #78 2017-02-14 09:52:11 +01:00
Arturo Gonzalez 584427de06 Added changes to finish rr feature. Ticket #169 2017-02-14 09:36:11 +01:00
artica 22e81a0c2f Auto-updated build strings. 2017-02-14 00:01:17 +01:00
m-lopez-f 1fe9ded0fc Add changes of visual mobile version of pandora. Gitlab: #148 2017-02-13 16:06:17 +01:00
Arturo Gonzalez b42e4a8277 Rewrite lost code. 2017-02-13 15:29:45 +01:00
artu30 e71c6070ad Merge branch 'feature/rolling_release' into 'develop' 
Feature/rolling release

See merge request !151
 2017-02-13 15:17:29 +01:00
Arturo Gonzalez de1291a378 Fixed db 2017-02-13 14:59:39 +01:00
Arturo Gonzalez 5b7f4a5139 Merge branch 'develop' into feature/rolling_release 
Conflicts:
	pandora_console/general/header.php
	pandora_console/include/functions.php
	pandora_console/index.php
	pandora_console/pandoradb_data.sql
 2017-02-13 14:19:25 +01:00
daniel 93e1c72949 fixed forms in agents/modules 2017-02-13 14:18:48 +01:00
Arturo Gonzalez 4c63756f51 Fixed classic menu mode. Ticket #250 2017-02-13 13:50:28 +01:00
Arturo Gonzalez 2cfce8979e Added new funtion to module cron interval with "from" and "to" forms. Ticket #246 2017-02-13 11:32:04 +01:00
artica 7b95f9dbfe Auto-updated build strings. 2017-02-13 00:01:13 +01:00
artica 5426cd36f6 Auto-updated build strings. 2017-02-12 00:01:12 +01:00
artica 570bc28301 Auto-updated build strings. 2017-02-11 00:01:16 +01:00
enriquecd bd7ca5645a Show unreachable host reponse when ping from custom responses - #53 2017-02-10 16:42:55 +01:00
Arturo Gonzalez 9303041450 Fixed events query with like in tags field. Ticket #208 2017-02-10 12:30:21 +01:00
Arturo Gonzalez 9a73cb56d7 Added module crontab to local modules with rc. Ticket #246 2017-02-10 11:43:12 +01:00
enriquecd 36aa73bdd8 Make alert messages window draggable, zindex 3, change disable logo in graph - #52 2017-02-10 10:18:53 +01:00
artica 060c6236c4 Auto-updated build strings. 2017-02-10 00:01:14 +01:00
enriquecd 9fd08e8728 Fix period field when open simple value and module graph - #15 2017-02-09 17:55:46 +01:00
Arturo Gonzalez 47338f240f Fixed module cron interval seter. Ticket #246 2017-02-09 15:54:33 +01:00
Arturo Gonzalez 46e1d41ce0 Fixed netflow filter. Ticket #207 2017-02-09 12:55:11 +01:00
Arturo Gonzalez 0e179a1725 Added "G" in srtftime format from date format. Ticket #241 2017-02-09 12:19:59 +01:00
daniel b41ef3cd4b add new report graph module histogram 2017-02-09 11:43:54 +01:00
Arturo Gonzalez e7bb60b61d Added open images folder to custom logo edit in setup visual. Ticket #51 2017-02-09 09:22:14 +01:00
Arturo Gonzalez f1bdcbd3c0 Added ux console images. Ticket #173 2017-02-09 08:15:51 +01:00
artica 5af516078c Auto-updated build strings. 2017-02-09 00:01:14 +01:00
enriquecd 53817271cf Empty panel when click over edit key in vconsole with an element selected - #50 2017-02-08 18:31:53 +01:00
enriquecd 294d95481c Enable fields in web modules created by policy when is unlinked - #237 2017-02-08 16:54:17 +01:00
daniel 87a11a7d20 Merge branch '49-la-consola-visual-tira-mucho-de-la-bbdd' into 'develop' 
Improved performance of groups within the visual console

See merge request !135
 2017-02-08 08:39:55 +01:00
artica 16f4281de7 Auto-updated build strings. 2017-02-08 00:02:21 +01:00
daniel 5a857ff4c9 Improved performance of groups within the visual console 2017-02-07 18:31:18 +01:00
enriquecd b6e9ed3604 Add titles to all levels buttons in lateral menu buttons / 2 - #234 2017-02-07 17:43:22 +01:00
enriquecd da366da872 Increase cell height in agent contact table of agent view - #48 2017-02-07 17:04:24 +01:00
enriquecd cb6c67de15 Change water mark logo - #7 2017-02-07 15:53:24 +01:00
enriquecd 8622b90b13 Add titles to lateral menu buttons - #234 2017-02-07 14:53:32 +01:00
Arturo Gonzalez f2ad744428 Fixed open maps migration. Ticket #231 2017-02-07 14:45:27 +01:00
enriquecd 18f1c96917 Show only service name in green header for service maps - #230 2017-02-07 13:58:04 +01:00
Arturo Gonzalez cafda2a116 Added new option to see the menu bar in classic mode. Ticket #234 2017-02-07 12:58:29 +01:00
Arturo Gonzalez 4e479ccb47 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 2017-02-07 10:42:58 +01:00
Arturo Gonzalez 1f1023db92 Added new fields to alert macros (snmp as well). Ticket #233 2017-02-07 10:41:48 +01:00
artica 4cb1f6466a Auto-updated build strings. 2017-02-07 00:01:16 +01:00
Arturo Gonzalez 3e0b0f231b Added more fields to alert macro fields. Ticket #233 2017-02-06 16:20:39 +01:00
daniel 188807c4cf change name modules create from wizard SNMP 2017-02-06 10:54:51 +01:00
daniel 0a26a31bd3 fixed errors in modules templates 2017-02-06 09:45:46 +01:00
Arturo Gonzalez 74dc73f744 Added new fitler option to netflow. Ticket #207 2017-02-06 09:29:13 +01:00
artica d7dc408f4e Auto-updated build strings. 2017-02-06 00:01:14 +01:00
artica 7e65547661 Auto-updated build strings. 2017-02-05 00:01:15 +01:00
artica 4a06176731 Auto-updated build strings. 2017-02-04 00:01:17 +01:00
enriquecd 80ec4e06ec Postprocess module help error reference with coma format and is with dot - #43 2017-02-03 15:13:32 +01:00
daniel 543fd0c7ea delete shortcut bar 2017-02-03 12:23:58 +01:00
artica 423a6c434d Auto-updated build strings. 2017-02-03 00:01:19 +01:00
enriquecd f9817a26ad Add enterprise_hook filter to all config_agents_has_remote_configuration functions - #41 2017-02-02 19:12:22 +01:00
enriquecd c9373e95fb No width limit in graph editor agents selector - #40 2017-02-02 18:38:48 +01:00
enriquecd 5d7d655833 Fix sound console for snmp traps alert, multiple selection and fix icons - #38 2017-02-02 17:46:59 +01:00
daniel a6fadecd47 add new macro in alerts 2017-02-02 16:11:46 +01:00
daniel 5dad591b02 fixed errors in reports evnts 2017-02-02 10:13:58 +01:00
artica 707381284e Auto-updated build strings. 2017-02-02 00:01:16 +01:00
Enrique Camargo 06a0b3b885 Merge branch '25-edicion-de-timethreshold-en-accion-de-alerta-integria-4372' into 'develop' 
Timethreshold_alert_edition_fix - 2 / Load fields fired in popup - #25

See merge request !105
 2017-02-01 19:22:03 +01:00
enriquecd af763e14e9 Timethreshold_alert_edition_fix - 2 / Load fields fired in popup - #25 2017-02-01 19:17:20 +01:00
enriquecd 363c147043 Disabled and enabled or all agents selector in agent massive operations - #37 2017-02-01 17:31:39 +01:00
Arturo Gonzalez 5971870b1c Added images to meta update manager. 2017-02-01 12:09:19 +01:00
Arturo Gonzalez 83241de441 Fixed default value in config. Ticket #218 2017-02-01 12:02:33 +01:00
Arturo Gonzalez d4a35a0097 Added old d3 lib to servicemap. Ticket #218 2017-02-01 11:58:39 +01:00
Arturo Gonzalez afd3322d52 Added new options to servicemap. Ticket #218 2017-02-01 11:57:10 +01:00
artica 295cd3806f Auto-updated build strings. 2017-02-01 00:01:16 +01:00
enriquecd 7c761c8080 Show/hide front page custom report display or not in setup visual on click - #35 2017-01-31 19:13:37 +01:00
daniel d1f49bebe5 fixed errors in reports evnts and alerts groups 2017-01-31 17:01:12 +01:00
daniel a2dee9edfd fixed errors in widgets groups status 2017-01-31 16:18:15 +01:00
Arturo Gonzalez 3976a45e89 Now times under 1 day will be shown in a correct format. Ticket #215 2017-01-31 15:46:56 +01:00
enriquecd 08f4f9524b Add titem, tmap, trel_item tables to migration 6 - 6.1 script - #34 2017-01-31 15:39:06 +01:00
Arturo Gonzalez f9c56237fd Fixed mac, avg and min values in reports and visual maps. Ticket #159 2017-01-31 12:42:10 +01:00
enriquecd cf4283c632 Make agent manager search bar case insensitive - #33 2017-01-31 11:42:12 +01:00
Arturo Gonzalez 9d5a79b6fc Fixed events with non privileges user. Ticket #208 2017-01-31 11:01:54 +01:00
artica 2f7a6f0286 Auto-updated build strings. 2017-01-31 00:01:18 +01:00
Arturo Gonzalez fea6a1134d Fixed update manager online open version. Ticket #201 2017-01-30 11:28:59 +01:00
artica c3c9189cc0 Auto-updated build strings. 2017-01-30 00:01:16 +01:00
artica 6ad1682ef9 Auto-updated build strings. 2017-01-29 00:01:14 +01:00
artica 5cf006e82e Auto-updated build strings. 2017-01-28 00:01:14 +01:00
enriquecd 60d8a6603e Add description section in html viewer, settable on setup/visual styles - #36 2017-01-27 17:25:10 +01:00
Arturo Gonzalez 1346e04157 Added images to ux console and meta update manager online. 2017-01-27 13:14:25 +01:00
artica ce306aa1d6 Auto-updated build strings. 2017-01-27 00:01:16 +01:00
Arturo Gonzalez c8806fe7df Added update manager online to metaconsole. Ticket #191 2017-01-26 14:54:26 +01:00
enriquecd f14f0d923f Add transition to hover change color in alert windows and left menu bar buttons - #30 2017-01-26 12:10:28 +01:00
artica 8465cd5266 Auto-updated build strings. 2017-01-26 00:01:16 +01:00
artu30 20fcd7ef32 Merge branch 'feature/ux_modules_hierarchy' into 'develop' 
Feature/ux modules hierarchy

See merge request !81
 2017-01-25 15:35:09 +01:00
Arturo Gonzalez 42dc9d2522 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 2017-01-25 14:00:03 +01:00
Arturo Gonzalez 3c8bc86ab7 Added cascade protection by module (agent, massive and api). Ticket #187 2017-01-25 13:59:14 +01:00
enriquecd d066c5f88f Erase integria incidents integration with integria tickets - #29 2017-01-25 12:40:42 +01:00
artica 1970167df4 Auto-updated build strings. 2017-01-25 00:01:13 +01:00
Arturo Gonzalez e41af015fb UX console in progress... (Added hierachy system to modules in tree view) 2017-01-24 16:02:09 +01:00
enriquecd 07c7d54566 Modify force button label in agent view - #28 2017-01-24 15:06:08 +01:00
enriquecd 3cec295b9e Escape quotes in str_warning and str_critical fields in agent editor - #26 2017-01-24 11:55:46 +01:00
artica c4a49f1ac9 Auto-updated build strings. 2017-01-24 00:01:16 +01:00
Arturo Gonzalez c99ff92c86 UX console in progress... (Fixed vcharts) 2017-01-23 17:55:27 +01:00
enriquecd 25535445fa Order by agent and module in general reports, fix group reports - #24 2017-01-23 17:39:33 +01:00