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

6642 Commits

Author SHA1 Message Date
artica 19dcc729da Auto-updated build strings. 2017-02-28 00:01:17 +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
enriquecd 983d00535a Change background color when mouse over rows in agent and module managers - #81 2017-02-27 14:28:09 +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
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
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
enriquecd 817bce5f4c Convert to array values revieved by ajax for updatedb - #77 2017-02-22 17:41:19 +01:00
Alejandro Gallardo Escobar 3d8af42834 Changed the agent name by its alias 2017-02-22 16:43:28 +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
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
enriquecd 454a799c3d Change count column label text in agent detail section - #75 2017-02-22 11:36:29 +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
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 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
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 a242395af0 Replace label definition and add help tip in custom reports items. Gitlab: #248 2017-02-21 13:01:34 +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
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
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
m-lopez-f 2c1e43a477 Re-fixed problems with agents name in visual consoles 2017-02-20 14:38:58 +01:00
Alejandro Gallardo Escobar 545dad643c XMerge branch 'develop' into feature/alias_friendly_name 2017-02-20 12:04:43 +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 f6f5d64d32 Added data precision to events table. Ticket #288 2017-02-17 12:16:33 +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
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
daniel cfb7a3a88e fixed tabs in reports 2017-02-16 15:40:56 +01:00
Arturo Gonzalez 928689ef3b Added some modifications in networkmaps fonts. Ticket #270 2017-02-16 15:05:44 +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
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
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
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 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
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 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
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
artica 5af516078c Auto-updated build strings. 2017-02-09 00:01:14 +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 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
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
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
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 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 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
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
Arturo Gonzalez f9c56237fd Fixed mac, avg and min values in reports and visual maps. Ticket #159 2017-01-31 12:42:10 +01:00
Arturo Gonzalez 9d5a79b6fc Fixed events with non privileges user. Ticket #208 2017-01-31 11:01:54 +01:00