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

2776 Commits

Author SHA1 Message Date
vgilc 05397a876f Merge branch '841-boolean-charts-in-agent-charts-section-dev' into 'develop' 
Added boolean modules to agent graphs section

See merge request !455
 2017-05-31 17:10:52 +02:00
vgilc c66810afea Merge branch '847-networkmap-autorefresh-dev' into 'develop' 
Fixed networkmap path in auto-refresh white list

See merge request !452
 2017-05-31 17:09:00 +02:00
vgilc 08642eacd3 Merge branch '311-Filtrar-por-campo-personalizado-en-eventos' into 'develop' 
Free search input in event list view filter also by custom_data - #311

See merge request !486
 2017-05-31 17:06:10 +02:00
vgilc 956a4a1b20 Merge branch '866-fixed-free-search-field-in-monitor-detail-view-dev' into 'develop' 
Fixed free search

See merge request !499
 2017-05-31 17:03:10 +02:00
vgilc 00e73a8213 Merge branch '675-search-filter-by-start-date-and-end-date-dev' into 'develop' 
Added date filter in snmp console

See merge request !471
 2017-05-31 17:02:14 +02:00
Arturo Gonzalez eec313c4c7 Fixed nwtflow live view filter table 2017-05-30 13:10:57 +02:00
Arturo Gonzalez f467d6d466 Fixed groups select width 2017-05-29 14:31:46 +02:00
Arturo Gonzalez 54b70e5927 Changed custom graph size specs in visual console 2017-05-26 12:55:37 +02:00
Arturo Gonzalez 2e71af2568 Added new visual styles to event sound console 2017-05-25 17:11:35 +02:00
Arturo Gonzalez 8b849efc3c Added changes to group view 2017-05-24 15:39:44 +02:00
Arturo Gonzalez 63129641eb Fixed free search 2017-05-23 16:54:24 +02:00
artu30 37757f7ace Merge branch 'develop' into '596-default_event_filter_by_user' 
# Conflicts:
#   pandora_console/godmode/users/configure_user.php
 2017-05-23 09:48:37 +02:00
Hirofumi Kosaka 5807e55459 Modified SNMP Console to prefer agent aliases as SNMP agent if registered. #149 2017-05-19 16:49:54 +09:00
Arturo Gonzalez 913aa4334b Save work and continue with more tests 2017-05-18 17:06:49 +02:00
enriquecd c4ffd0257f Free search input in event list view filter also by custom_data - #311 2017-05-18 14:59:17 +02:00
vgilc 10e6153574 Merge branch '805-change-tip-icon-in-trap-editor-dev' into 'develop' 
Added new help tip icon to snmp console

See merge request !443
 2017-05-18 10:00:31 +02:00
vgilc e89be76e61 Merge branch 'fixed-graphs-styles' into 'develop' 
Fixed graphs styles Gitlab: #537

See merge request !283
 2017-05-17 17:45:55 +02:00
artu30 e54eb93ea8 Merge branch 'develop' into '805-change-tip-icon-in-trap-editor-dev' 
# Conflicts:
#   pandora_console/operation/snmpconsole/snmp_view.php
 2017-05-17 17:37:10 +02:00
vgilc 3118a70f66 Merge branch 'dashboards-in-home-page-dev' into 'develop' 
Added dashboards to "edit my user" section

See merge request !391
 2017-05-17 17:20:29 +02:00
vgilc 28eaae4601 Merge branch '724-SNMP-Console--En-el-campo-Agente-mete-el-Agent-name-en-lugar-del-Alias-dev' into 'develop' 
Changed agent name by agent alias

See merge request !375
 2017-05-17 17:16:48 +02:00
Arturo Gonzalez 19a12b23ef Added white start to snmp traps 2017-05-17 11:37:19 +02:00
Arturo Gonzalez d49f1f9916 Added tags filter to mosule massive operations (agent selection first) 2017-05-17 10:41:30 +02:00
Arturo Gonzalez 4b94e7ce2b Added tag filter to module massive operations (edit and modules selection first) 2017-05-17 09:59:10 +02:00
Arturo Gonzalez 1361ecd2e9 Added tags select field 2017-05-16 16:37:48 +02:00
Arturo Gonzalez cbe236b46b Added date filter in snmp console 2017-05-16 14:40:30 +02:00
enriquecd 71d868220a Hide scroll bars when vconsole is in fullscreen mode, also in dashboard when there is only one vconsole widget - #865 2017-05-16 12:36:58 +02:00
enriquecd ab9930d4f3 Fix background color, countdown refresh box, and make graphs dynamics - #865 2017-05-12 11:41:45 +02:00
Arturo Gonzalez 540aa60764 Added alias search to general search and case no case sensitive search to agent details search field 2017-05-12 10:30:45 +02:00
Arturo Gonzalez 6815a69bfc Added boolean modules to agent graphs section 2017-05-10 13:29:03 +02:00
m-lopez-f 808e579af7 Merge branch 'develop' into fixed-graphs-styles 2017-05-10 11:07:39 +02:00
Arturo Gonzalez 0fb02ff27a Fixed networkmap path in auto-refresh white list 2017-05-10 10:01:23 +02:00
Arturo Gonzalez dd5087cb53 Added new help tip icon to snmp console 2017-05-08 17:49:05 +02:00
enriquecd a99eba3a45 Fill background vconsole widget with vconsole color source and fix vconsole size editor - #786 2017-04-27 13:28:49 +02:00
vgilc 4040f024fa Merge branch '114-selector-multiple-muy-pequeno-en-graficas-de-agente' into 'develop' 
Make combobox of custom graph editor in agent view width adaptable - #114

See merge request !348
 2017-04-25 16:26:45 +02:00
vgilc 4b5da69e31 Merge branch '688-problema-acl-enterprise-workspace-2-7' into 'develop' 
Change sec url string in message and vconsole section - #688 - 2

See merge request !378
 2017-04-25 16:21:00 +02:00
vgilc a8d3ea7454 Merge branch '678-estadísticas-de-eventos-con-gráficas-desiguales' into 'develop' 
Fixed size graphs in event_statistics

See merge request !340
 2017-04-25 16:17:12 +02:00
vgilc ea6afb3701 Merge branch '681-Añadir-control-flotante-a-vistas-fullscreen' into 'develop' 
Added floating control in agents/modules, event list and snmp traps list

See merge request !351
 2017-04-25 16:15:41 +02:00
Daniel Maya 29ac2191b7 Disabled modules no longer appear in the search 2017-04-25 15:41:01 +02:00
daniel 8e481dc473 fixed errors in agent detail acl strict 2017-04-24 10:41:23 +02:00
Arturo Gonzalez 87f3798499 Added dashboards to "edit my user" section 2017-04-20 17:36:26 +02:00
Arturo Gonzalez 4c07fe5d3f Added nodes regeneration in map group updates 2017-04-20 13:18:55 +02:00
Arturo Gonzalez 1066124678 Merge branch 'develop' into 596-default_event_filter_by_user 
Conflicts:
	pandora_agents/unix/DEBIAN/control
	pandora_agents/unix/DEBIAN/make_deb_package.sh
	pandora_agents/unix/pandora_agent
	pandora_agents/unix/pandora_agent.redhat.spec
	pandora_agents/unix/pandora_agent.spec
	pandora_agents/unix/pandora_agent_installer
	pandora_agents/win32/installer/pandora.mpi
	pandora_agents/win32/pandora.cc
	pandora_agents/win32/versioninfo.rc
	pandora_console/DEBIAN/control
	pandora_console/DEBIAN/make_deb_package.sh
	pandora_console/extras/mr/1.sql
	pandora_console/include/config_process.php
	pandora_console/install.php
	pandora_console/pandora_console.redhat.spec
	pandora_console/pandora_console.spec
	pandora_server/DEBIAN/control
	pandora_server/DEBIAN/make_deb_package.sh
	pandora_server/lib/PandoraFMS/Config.pm
	pandora_server/pandora_server.redhat.spec
	pandora_server/pandora_server.spec
	pandora_server/pandora_server_installer
	pandora_server/util/pandora_db.pl
	pandora_server/util/pandora_manage.pl
 2017-04-18 11:28:02 +02:00
enriquecd ee128242bc Change sec url string in message and vconsole section - #688 - 2 2017-04-17 18:51:59 +02:00
Daniel Maya f13085ed3a Changed agent name by agent alias 2017-04-17 14:45:42 +02:00
enriquecd 8eb837803e Add link to remote config column icons y agent view list - #124 2017-04-17 10:57:43 +02:00
Daniel Maya a81dcdcfc5 When there is no custom graph redirects to the graph list 2017-04-11 15:30:32 +02:00
Arturo Gonzalez f05d687fb3 Added some modifications to implements a default filter by user in event section 2017-04-10 09:53:32 +02:00
vgilc 553e58deba Merge branch '99-problemas-visualizacion-graficas-combinadas-tipo-gauge-bullet-chart-y-pie-chart-en-consolas-visuales' into 'develop' 
Filter custom graph size in  visual console editor, autoset size - #99

See merge request !287
 2017-04-07 12:51:37 +02:00
vgilc af13e0f31d Merge branch '101-fallo-en-el-filtro-de-eventos-en-el-filtrado-de-cadena-pandora7' into 'develop' 
Added safe output to free search at loading event filter

See merge request !298
 2017-04-07 12:51:00 +02:00
vgilc 999162f380 Merge branch '38-no-funciona-event-alerts-sobre-alertas-de-snmp-traps-integria-4383' into 'develop' 
Alert in sound console with snmp alerts events - #38

See merge request !291
 2017-04-07 12:50:31 +02:00
vgilc ab70607156 Merge branch '562-problema-acls-politicas-7-open' into 'develop' 
Change sec param in policies section, gpolicies to gmodules / 7 / open - #562

See merge request !301
 2017-04-07 12:37:35 +02:00
Daniel Maya 6d1dc162e8 Added floating control in agents/modules, event list and snmp traps list 2017-04-07 12:08:42 +02:00
Arturo Gonzalez 22813cc412 Added changes to events query vars 2017-04-06 14:03:49 +02:00
Arturo Gonzalez e576f6d3e8 Added some tags fixes to event filter 2017-04-06 13:20:34 +02:00
Arturo Gonzalez dc654b0f3e Added "none" filter and fixed tags update error 2017-04-06 13:00:30 +02:00
Arturo Gonzalez 5185105c03 Added default filter elements to filter table and filter tags. 2017-04-06 11:45:22 +02:00
enriquecd cbd07089c6 Make combobox of custom graph editor in agent view width adaptable - #114 2017-04-05 16:52:37 +02:00
vgilc 3f27e0a306 Revert "Merge branch 'remove-traces-debug' into 'develop'" 
This reverts merge request !266
 2017-04-04 13:48:11 +02:00
vgilc 6b2cdb9784 Merge branch 'remove-traces-debug' into 'develop' 
remove debug console.log traces.

See merge request !266
 2017-04-04 13:47:41 +02:00
Daniel Maya 37c9a721e8 Fixed size graphs in event_statistics 2017-04-03 09:59:36 +02:00
enriquecd 3d89007adb Reposition of footer after load ajax elements in networkmap dialog - #112 2017-03-31 14:16:52 +02:00
Arturo Gonzalez a67d40a447 Added a few modifications to move the footer when nodes table is too long and recolocate interface text with every movement to see it well 2017-03-30 15:56:00 +02:00
vgilc f7b4523b1f Merge branch 'problems-with-interfaces-snmp' into 'develop' 
Fixed interfaces snmp, because dont show icon of open graphs and problems with show graphs when click in icons. Gitlab: #541

See merge request !277
 2017-03-29 10:12:53 +02:00
enriquecd 15749e323f Change sec param in policies section, gpolicies to gmodules / 7 / open - #562 2017-03-24 13:07:49 +01:00
fermin831 531e3a1391 Added safe output to free search at loading event filter 2017-03-24 10:46:41 +01:00
daniel 26acc537a4 fixed minor error in networkmap for defect spring2 2017-03-23 13:10:50 +01:00
Daniel Maya 6948a2fa56 Added start time in snmp interface graphics 2017-03-23 12:32:30 +01:00
enriquecd 22af4e703a Alert in sound console with snmp alerts events - #38 2017-03-23 10:31:04 +01:00
enriquecd 62541482ab Filter custom graph size in visual console editor, autoset size - #99 2017-03-22 10:10:56 +01:00
m-lopez-f 9e1b467850 new changes in graphs 2017-03-17 13:30:11 +01:00
m-lopez-f 26b3754ee8 Fixed interfaces snmp, because dont show icon of open graphs and problems with show graphs when click in icons. Gitlab: #541 2017-03-17 10:13:57 +01:00
m-lopez-f b937db8f35 remove debug console.log traces. 2017-03-16 09:10:22 +01:00
vgilc 41c774ac99 Merge branch 'cherry-pick-22138f62' into 'develop' 
DEVELOP::: Fixed problems with htmld tags in list events and other view that include list of events. Gitlab: #529

See merge request !257
 2017-03-15 15:58:45 +01:00
m-lopez-f 22f7bae5ae Fixed problems with htmld tags in list events and other view that include list of events. Gitlab: #529 2017-03-15 12:17:01 +01:00
enriquecd 52fb7ccfd7 Filter snmp console sql sentence by user profile and group - #95 2017-03-15 11:37:47 +01:00
enriquecd 79b5f73844 Not show Check ACL extension tab in agent view - #94 2017-03-14 13:28:39 +01:00
Arturo Gonzalez b70e8b8f6f Added all type of recon task to networkmap editor. 2017-03-14 08:35:16 +01:00
enriquecd 0094cfa9bf Center alert modal window when is opened - #93 2017-03-13 13:25:16 +01:00
m-lopez-f ed83c756e2 Fixed problems with search data in general search. Gitlab: #508 2017-03-13 09:49:19 +01:00
Ramon Novoa 4a739775c9 Merge remote-tracking branch 'origin/develop' into feature#new-iface-names 2017-03-10 10:32:46 +01:00
Ramon Novoa 9e7c6612be Merge branch 'develop' into feature#new-iface-names 2017-03-10 10:32:40 +01:00
m-lopez-f 8de4984faf Fixed dialog of system warning alerts. Gitlab: #506 2017-03-09 15:40:59 +01:00
Arturo Gonzalez 7dd279b902 Rewrite code to modules type cause it was broken. 2017-03-09 08:58:11 +01:00
m-lopez-f e5ec0cb35a Kill pink unicorns 2017-03-07 16:30:40 +01:00
m-lopez-f ba423c93d8 Only view of system event of user that have admin powers. Gitlab: #455 2017-03-07 16:30:01 +01:00
Enrique Camargo 7be73cbfce Merge branch 'develop' into '84-el-tamano-de-las-graficas-no-respeta-lo-que-se-previsualiza-en-el-editor' 
# Conflicts:
#   pandora_console/operation/visual_console/render_view.php
 2017-03-07 13:19:34 +01:00
enriquecd 0acfe23e9d Fix newlines in reporting viewer and pdf generatos - #88 2017-03-06 17:07:29 +01:00
fermin831 223a9a6d0e Fixed events list view to Read only users 2017-03-06 13:23:29 +01:00
m-lopez-f 7f0359283d Fixed problems with ACL permmisions. Gitlab: #451 2017-03-06 12:54:48 +01:00
m-lopez-f b8f6b9fad4 Fixed style of visual mapwidget in dashboards. Gitlab: #374 2017-03-03 12:50:03 +01:00
Daniel Maya af131ede10 Fixed alias and changed icons in sound console 2017-03-03 11:49:53 +01:00
fermin831 a8f7668903 Modified z-index on full screen visual console bar 2017-03-03 11:37:51 +01:00
enriquecd e3f62b1857 Change visual console graphs design and fix selection move - #84 2017-03-03 11:25:27 +01:00
fermin831 1cf87e7753 Fixed PHP 5.3 compatibility on GIS maps 2017-03-03 10:50:17 +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
Daniel Maya 3666ab9745 Changed name by alias in event list 2017-03-02 12:50:42 +01:00
enriquecd 2ca6783278 Align home screen and skin inputs in user editor - #82 2017-03-01 16:36:36 +01:00
Arturo Gonzalez 8bae65b4a2 Fixed gis map agents name when refresh map. Ticket #395 2017-03-01 09:20:28 +01:00
fermin831 19fab5d96b Added loaded filter name to active filters view 2017-02-28 19:27:40 +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
m-lopez-f d83981ef5d Fixed values and graphs in visual consoles. 2017-02-28 12:25:06 +01:00
daniel 8f8a17bf24 fixed alias for name in reports 2017-02-27 16:48:28 +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
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
Alejandro Gallardo Escobar 3d521ec290 Changed the agent name by its alias in some sections 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
Alejandro Gallardo Escobar 6fc884d327 Changed the agent name by its alias in the events sections 2017-02-21 19:07:17 +01:00
fermin831 d16138c68e Modified GIS Maps to print OpenMaps on empty google license 2017-02-21 18:48:50 +01:00
daniel bf29d4c5f9 fixed error in view agent/module 2017-02-21 17:21:10 +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 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
enriquecd 48a04d6c47 Improve custom graph interface - #66 2017-02-21 12:18:18 +01:00
Alejandro Gallardo Escobar 58617c00aa Merge branch 'develop' into feature/alias_friendly_name 2017-02-20 18:52:18 +01:00
fermin831 7592bce0a9 Updated eHorus client 2017-02-20 18:25:46 +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
Arturo Gonzalez 4a6cdf822d Fixed modules lejend in agent view. Ticket #294 2017-02-20 15:02:01 +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
Alejandro Gallardo Escobar 545dad643c XMerge branch 'develop' into feature/alias_friendly_name 2017-02-20 12:04:43 +01:00
m-lopez-f e118729398 Fixed problems with column 'last contact'. Gitlab: #269 2017-02-17 13:34:30 +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
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
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
daniel d0faeb3ec1 fixed errors in graphs 2017-02-16 11:18:42 +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
daniel 93e1c72949 fixed forms in agents/modules 2017-02-13 14:18:48 +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
Arturo Gonzalez 46e1d41ce0 Fixed netflow filter. Ticket #207 2017-02-09 12:55:11 +01:00
enriquecd da366da872 Increase cell height in agent contact table of agent view - #48 2017-02-07 17:04:24 +01:00
Arturo Gonzalez f2ad744428 Fixed open maps migration. Ticket #231 2017-02-07 14:45:27 +01:00
Arturo Gonzalez 74dc73f744 Added new fitler option to netflow. Ticket #207 2017-02-06 09:29:13 +01:00
daniel 543fd0c7ea delete shortcut bar 2017-02-03 12:23:58 +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
Arturo Gonzalez 9d5a79b6fc Fixed events with non privileges user. Ticket #208 2017-01-31 11:01:54 +01:00
enriquecd 60d8a6603e Add description section in html viewer, settable on setup/visual styles - #36 2017-01-27 17:25:10 +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
enriquecd d066c5f88f Erase integria incidents integration with integria tickets - #29 2017-01-25 12:40:42 +01:00