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

2628 Commits

Author SHA1 Message Date
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
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
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
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
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 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