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

651 Commits

Author SHA1 Message Date
danielmaya 5b30aa5560 Added source, comment and id_extra in event filter 2018-08-31 16:25:12 +02:00
vgilc a4d1cfc9e6 Merge branch '2641-no-se-filtran-eventos-por-grupo-secundario-en-meta' into 'develop' 
2641 no se filtran eventos por grupo secundario en meta

See merge request
2018-08-16 11:03:02 +02:00
vgilc dc8020dbdc Merge branch 'ent-2626-pantalla-de-edicion-de-modulos-en-grupos-secundarios' into 'develop' 
[Secondary groups] Fixed modules permissions in some views

See merge request
2018-08-16 09:46:28 +02:00
fermin831 05a0eb0db6 Fixed events secondary groups filter in metaconsole 2018-08-14 17:06:15 +02:00
fermin831 d3c3304976 Fixed pagination and added filter to All events 2018-08-14 10:40:56 +02:00
fermin831 62617e609c [Secondary groups] Fixed group agents and group events in events filter 2018-08-08 13:17:03 +02:00
fermin831 4315cef4c9 [Secondary groups] Fixed modules permissions in some views 2018-08-08 11:49:54 +02:00
alejandro-campos 097661d82b implemented sort filter to event view custom fields 2018-08-03 10:38:53 +02:00
alejandro-campos 01656f2e76 conflict resolution on branch 2389-Ordenar-eventos-por-campo 2018-08-02 10:27:31 +02:00
manuel.montes a476d008ac fix bug in metaconsole view events 2018-07-26 15:30:49 +02:00
samucarc 202f72d1c3 Fixed fields list in manage events-custom fields 2018-07-25 17:23:13 +02:00
manuel.montes b922066a72 Add items to the view events 2018-07-19 18:04:50 +02:00
alejandro-campos 6ec4787c38 added order filters to events table 2018-07-10 15:11:18 +02:00
fermin831 288d2bafb6 Added in progres selected button to events view 2018-06-20 18:56:44 +02:00
Alejandro Gallardo Escobar f6184b52da Merge branch 'develop' into ent-639-add-user-defined-timezones 2018-06-11 17:42:02 +02:00
Alejandro Gallardo Escobar fac3e21829 Added a lot of fixes to the dates stored as strings without timezone information to made them use the user timezone 2018-06-11 16:40:10 +02:00
fermin831 6bd672fd38 Fixed free search in events view 2018-05-31 20:32:04 +02:00
fermin831 88e060893a Merge branch 'develop' into 2106-intracom-rebranding 
Conflicts resolved:
	pandora_console/operation/events/events_rss.php
 2018-05-28 12:12:16 +02:00
fermin831 750ed29ac9 [Rebranding] Added a header to white backgrounds and make the favicon and the mobile console configurable 2018-05-24 16:59:50 +02:00
fermin831 ed18d58676 [Rebranding] Open operation/* 2018-05-14 15:52:51 +02:00
fermin831 fe124bff5f Fixed rss events due to secondary groups 2018-05-14 14:41:11 +02:00
vgilc d746af9c28 Merge branch 'ent-1888-anadir-nueva-feature-para-poder-cambiar-los-eventos-a-estado-en-proceso' into 'develop' 
Ent 1888 anadir nueva feature para poder cambiar los eventos a estado en proceso

See merge request
2018-05-09 10:24:19 +02:00
vgilc 96df6938fa Merge branch 'ent-1917-tmb-personalizacion-exportacion-csv-de-eventos' into 'develop' 
Ent 1917 tmb personalizacion exportacion csv de eventos

See merge request
2018-05-09 10:23:38 +02:00
fermin831 7162241ef9 Change the extension of CSV events file to .csv 2018-04-30 15:55:15 +02:00
fermin831 57c928ec8a [Events] Fixed csv export after secondary groups 2018-04-30 12:38:29 +02:00
fermin831 9c9f75152d Added custom confirm dialog to events 2018-04-25 12:34:33 +02:00
fermin831 112bbac527 Added id to in progress status bin icon (disabled) 2018-04-24 12:11:04 +02:00
fermin831 e09e1c4cd4 Fixed in progress event button in metaconsole and other problems 2018-04-24 11:54:45 +02:00
fermin831 a21eaafc61 Added in progress button to events list 2018-04-23 18:41:44 +02:00
fermin831 32f96c45ba [Events] Added ID to export CSV 2018-04-18 19:50:13 +02:00
fermin831 0b23f25455 [Events] Fixed csv export after secondary groups 2018-04-18 19:47:20 +02:00
danielmaya 70bf27f48a Added checking user tags in event list 2018-04-17 10:10:18 +02:00
fermin831 60f7a0ab79 Merge branch 'develop' into 2015-implementacion-de-grupos-secundarios 
Conflicts:
	pandora_console/include/class/Tree.class.php
 2018-04-10 09:29:14 +02:00
fermin831 f6e03c0faa [Secondary groups] Added secondary groups in some events queries 2018-04-09 17:01:39 +02:00
fermin831 c88e6e703a [Secondary groups] Fixed duplicated agents in group view and agent detail 2018-04-04 11:17:08 +02:00
fermin831 2839388e9e [Secondary Groups] More events fixes 2018-03-27 18:07:43 +02:00
fermin831 4d78b28d17 [Secondary Groups] Fixed grouped agents events in node 2018-03-27 17:53:11 +02:00
fermin831 c96b883614 [Secondary groups] Fixed agent view to include secondary agents 2018-03-26 12:52:37 +02:00
danielmaya 0fc33f3fa2 Fixed module filter in view events 2018-02-23 14:38:26 +01:00
fbsanchez 1a986fccf6 Fixed SQL error on unscaped parameter 2018-02-13 17:34:09 +01:00
vgilc 3cad7be4a5 Merge branch '1749-sistena-cache-de-acl-s-de-la-consola' into 'develop' 
Modified users_get_groups

See merge request
2018-01-31 15:15:50 +01:00
daniel f3239b46a3 add propagate groups in list events 2018-01-31 12:39:25 +01:00
daniel 0d0b7ada48 Merge branch 'develop' into 1749-sistena-cache-de-acl-s-de-la-consola 
Conflicts:
	pandora_console/include/functions_users.php
 2018-01-30 17:56:30 +01:00
daniel 5d61ff5056 fixed error in ACL 2018-01-12 14:17:48 +01:00
daniel 246d0ce9e0 fixed warnings php in log pandora 2018-01-08 15:05:51 +01:00
daniel 6cc0ca51c3 fixed minor errors in select for events 2017-12-28 16:38:47 +01:00
daniel e0b90f2be0 optimization view events 2017-11-30 14:00:08 +01:00
vgilc 7947a1797c Merge branch 'consola-visual-muestra-entities-en-el-textarea-donde-muestra-el-ultimo-evento-que-hace-saltar-la-consola' into 'develop' 
Fixed the HTML entities problem of the sound events view

See merge request
2017-11-29 17:02:50 +01:00
vgilc b98ac19f91 Merge branch '1570-Error-en-paginación-de-eventos-con-texto-libre-dev' into 'develop' 
Fixed pagination errors with free search

See merge request
2017-11-29 15:38:19 +01:00
danielmaya 14fe06e536 Fixed pagination errors with free search 2017-11-13 12:07:53 +01:00
Alejandro Gallardo Escobar 15c87bdd67 [Console > Events view] Removed the events graph to improve ~75% the render time 2017-10-31 16:43:49 +01:00
Alejandro Gallardo Escobar 40c15af9f2 [] Fixed the HTML entities problem of the sound events view 2017-10-19 11:46:55 +02:00
Daniel Maya fc9a5c4662 Fixed search by tags 2017-10-10 13:39:44 +02:00
Daniel Maya b0b51c649b Fixed search by tags in event list 2017-10-04 17:43:12 +02:00
Arturo Gonzalez 1b766f8ce2 Fixed events filter from agent events graph 2017-07-10 16:22:41 +02:00
Arturo Gonzalez 242667e162 Fixed selector 2017-06-27 11:10:07 +02:00
enriquecd 777713f939 Fix bug when there is an event with a bad data in custom_data - 2017-06-07 17:55:53 +02:00
Arturo Gonzalez 1362bbc555 Added styles to sound events window 2017-06-01 13:50:35 +02:00
vgilc 87f3cb46f6 Merge branch '923-New-sound-events-console-view-dev' into 'develop' 
Added new visual styles to event sound console

See merge request
2017-05-31 17:46:11 +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 - 

See merge request
2017-05-31 17:06:10 +02:00
Arturo Gonzalez 2e71af2568 Added new visual styles to event sound console 2017-05-25 17:11:35 +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
enriquecd c4ffd0257f Free search input in event list view filter also by custom_data - 2017-05-18 14:59:17 +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
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
2017-04-25 16:15:41 +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
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 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
2017-04-07 12:51:00 +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
Daniel Maya 37c9a721e8 Fixed size graphs in event_statistics 2017-04-03 09:59:36 +02:00
fermin831 531e3a1391 Added safe output to free search at loading event filter 2017-03-24 10:46:41 +01:00
enriquecd 22af4e703a Alert in sound console with snmp alerts events - 2017-03-23 10:31:04 +01:00
m-lopez-f 22f7bae5ae Fixed problems with htmld tags in list events and other view that include list of events. Gitlab: 2017-03-15 12:17:01 +01:00
m-lopez-f ba423c93d8 Only view of system event of user that have admin powers. Gitlab: 2017-03-07 16:30:01 +01:00
fermin831 223a9a6d0e Fixed events list view to Read only users 2017-03-06 13:23:29 +01:00
Daniel Maya af131ede10 Fixed alias and changed icons in sound console 2017-03-03 11:49:53 +01:00
Daniel Maya 220e27b224 Fixed agents when changing groups 2017-03-02 16:14:42 +01:00
Daniel Maya 3666ab9745 Changed name by alias in event list 2017-03-02 12:50:42 +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
Alejandro Gallardo Escobar 3d8af42834 Changed the agent name by its alias 2017-02-22 16:43:28 +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
Daniel Maya 76cb61f288 Changes for the merge 2017-02-21 15:31:20 +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 9303041450 Fixed events query with like in tags field. Ticket 2017-02-10 12:30:21 +01:00
enriquecd 5d7d655833 Fix sound console for snmp traps alert, multiple selection and fix icons - 2017-02-02 17:46:59 +01:00
Arturo Gonzalez 9d5a79b6fc Fixed events with non privileges user. Ticket 2017-01-31 11:01:54 +01:00
m-lopez-f 19a06f5828 Fixed lost filter in url pagination events in metaconsole. Ticket: 
(cherry picked from commit c708991cb4)
 2017-01-10 09:55:59 +01:00
daniel d44dc61758 fixed minor error order by desc event list 
(cherry picked from commit 9a48e52208)
 2017-01-04 14:34:35 +01:00
m-lopez-f c75a5a86f4 Merge branch 'develop' of https://192.168.50.5:8081/artica/pandorafms into develop 2016-12-13 13:11:18 +01:00
m-lopez-f b8453a346b Fixed problems with total events in list of events. Ticket: 
(cherry picked from commit 3ccb068e09)
 2016-12-13 13:11:04 +01:00
Arturo Gonzalez 8b6caf8628 Added new icon to sound events console. Ticket GitLab 2016-12-13 12:15:07 +01:00
Arturo Gonzalez e9eb60a718 Changed events sound styles and added new filters. Ticket Gitlab 2016-12-05 15:23:17 +01:00
m-lopez-f 3b0344298c Revert "Fixed problems with double pandora in servers. Ticket: #3557" 
This reverts commit e7021d8a0f.
 2016-11-18 13:01:13 +01:00
m-lopez-f e7021d8a0f Fixed problems with double pandora in servers. Ticket: 2016-11-07 09:12:58 +01:00
daniel 7650674043 fixed minor error in list events js 2016-10-27 13:09:16 +02:00
Daniel Maya cf3d44872f Changed agent name 2016-10-06 12:10:10 +02:00
Daniel Maya 54dcadfe33 changed agent name by alias in visual console,custom reports,view events and csv files. 2016-09-29 13:09:50 +02:00
enriquecd b722e70620 Changes on enterpise alert icons, limit screens and favicons 2016-09-28 13:26:58 +02:00
enriquecd a051243b64 GUI improvement, add enterprise edition popup - ticket gitlab 49/68 2016-09-19 16:20:18 +02:00
m-lopez-f 581d3835db Fixed acl's permmissions. Ticket 2016-09-08 16:06:12 +02:00
m-lopez-f 02388ff31f Add style css to image and fixed problems in metaconsole when grouped by agents in events. Internal ticket: 2016-09-01 10:50:34 +02:00
Daniel Maya 58f0ccae77 Added default event filter. Ticket . 2016-08-31 11:13:37 +02:00
daniel dcb18bcbd2 add graph agent new feature ticket integria: 3722 2016-08-19 12:46:27 +02:00
Daniel Maya e32c606fb0 Added new date filters. Ticket . 2016-08-19 11:23:09 +02:00
m-lopez-f 9c256623d0 Fixed problems with group agents. Tiquet: 
(cherry picked from commit 774b0f9cab)
 2016-08-16 10:44:21 +02:00
m-lopez-f 2217e9f908 Fixed problems with group agents. Tiquet: 2016-07-22 16:08:45 +02:00
Arturo Gonzalez 31fcab0309 Fixed agent serarch in metaconsole events. Ticket#3766 2016-06-03 11:00:35 +02:00
fermin831 ea313336ab Reformuled users_can_manage_group_all Tickets 2016-06-01 18:11:47 +02:00
Arturo Gonzalez 9a9f8e17b8 Fixed events with/without tags table in advanced options. Ticket 2016-05-25 17:40:34 +02:00
m-lopez-f 4b90a4f318 Fixed problems in new feature with url. Tiquet: 2016-05-23 10:00:50 +02:00
m-lopez-f fe51e17511 Feature grouped by agent in event list. Supported to metaconsole. Tiquet: 2016-05-23 09:45:42 +02:00
m-lopez-f 9f772e5091 Feature. new form of groped data in event list. Tiquet: 2016-05-23 09:22:57 +02:00
fermin831 179857e560 Fixed filter agent and modules empty in events 2016-03-08 13:51:08 +01:00
fermin831 2126843f1e Changed instruction column in event view 2015-12-30 12:25:42 +01:00
Arturo Gonzalez 5773a94022 Fixed table in events filter. Ticket#2940 2015-11-05 10:40:50 +01:00
m-lopez-f bea8170120 Fixed problems with function and pass variables. Tiquet: 2015-10-06 15:37:16 +02:00
m-lopez-f 7d6f03c3c8 Fixed problems with save event filters and dont save agent and module. Tiquet: 2015-09-30 09:26:19 +02:00
Arturo Gonzalez Diaz 378bcf09c3 Fixed sound_events access in Pandora 6. Ticket 2015-09-08 11:52:06 +02:00
Arturo Gonzalez Diaz ffb1d9fe98 Fixed error in tags table, the tables were unbalanced. Ticket 2015-09-07 10:18:55 +02:00
m-lopez-f ea850a7d7a Fixed problems with access. Tiquet: 2015-07-29 10:43:14 +02:00
mdtrooper f1ada9076e Added a filter 'normal & critical' in severity into events. 2015-07-21 10:40:29 +02:00
Alejandro Gallardo Escobar a097aabf80 Replaced the use of the jQuery 'attr' function with the 'prop' function when using the 'selected' property. 
The 'attr' function is going to be deprecated an may cause errors in Firefox.
 2015-07-14 11:11:22 +02:00
m-lopez-f 09f6b7a29a Fixed styles metaconsole 2015-07-07 13:57:47 +02:00
m-lopez-f 10a5dc5ffb Fixed style in events filters list 2015-07-03 14:55:12 +02:00
m-lopez-f 09bcaa42f5 Change visual of metaconsole. 2015-07-01 11:27:37 +02:00
m-lopez-f 69bc104b99 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-06-30 17:06:15 +02:00
m-lopez-f b880f8c726 Fixed style event list in metaconsole 2015-06-30 17:05:58 +02:00
Ramon Novoa a9f2171cce Show system events in the metaconsole. 2015-06-30 16:48:32 +02:00
m-lopez-f 94c742bfbe Merge from Develop 2015-06-25 10:40:35 +02:00
m-lopez-f 5b4214277b Changed of visual 2015-06-25 10:07:53 +02:00
Alejandro Gallardo Escobar 3b037caf32 Merge remote-tracking branch 'origin/develop' into features/oracle 2015-06-18 20:02:01 +02:00
m-lopez-f 9e528d0459 Change visual of console 2015-06-12 15:50:46 +02:00
Alejandro Gallardo Escobar 11d50f06ba Removed some jQuery.ajax() 'timeout: 10000' and 'async: false' properties 2015-06-11 12:08:14 +02:00
mdtrooper 7574f6ed09 Clean the source code style. 2015-06-08 13:13:09 +02:00
mdtrooper 89cac169f4 Clean the source code style. 2015-06-08 11:05:19 +02:00
Alejandro Gallardo Escobar 8fbe1175b5 Merge remote-tracking branch 'origin/develop' into features/oracle 
Conflicts resolved:
	pandora_console/DEBIAN/control
	pandora_console/DEBIAN/make_deb_package.sh
	pandora_console/include/config_process.php
	pandora_console/pandoradb.data.oracle.sql
 2015-06-02 18:08:46 +02:00
m-lopez-f 47a6c973d1 Add more width to select tags in filters events and truncate name. Tiquet: 2015-05-28 10:34:10 +02:00
Alejandro Gallardo Escobar 5906f6dd44 Re-fixed the agents filter 2015-05-26 12:07:13 +02:00
Alejandro Gallardo Escobar d7801c2933 Merge remote-tracking branch 'origin/develop' into features/oracle 
Conflicts resolved:
	pandora_console/extensions/module_groups.php
	pandora_console/godmode/reporting/graph_builder.graph_editor.php
	pandora_console/operation/events/events_list.php
 2015-05-26 10:29:38 +02:00
Alejandro Gallardo Escobar c5ca1a263c Fixed the filter management (load, save and update) 2015-05-22 17:48:58 +02:00
mdtrooper fcd6927efb Fixed the empty list of events. 2015-05-22 15:00:06 +02:00
mdtrooper 83967d3526 Fixed PHP Warnings 2015-05-22 13:22:12 +02:00
mdtrooper 3d32d5645e Fixed the event list when it is setted the replication, now the info message show again. 2015-05-22 13:10:05 +02:00
Alejandro Gallardo Escobar 36180716ee Error fixes 2015-05-22 11:14:40 +02:00