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

538 Commits

Author SHA1 Message Date
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
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 !298
 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 - #38 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: #529 2017-03-15 12:17:01 +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
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 #208 2017-02-10 12:30:21 +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
m-lopez-f 19a06f5828 Fixed lost filter in url pagination events in metaconsole. Ticket: #4243 
(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: #4243 
(cherry picked from commit 3ccb068e09)
 2016-12-13 13:11:04 +01:00
Arturo Gonzalez 8b6caf8628 Added new icon to sound events console. Ticket #109 GitLab 2016-12-13 12:15:07 +01:00
Arturo Gonzalez e9eb60a718 Changed events sound styles and added new filters. Ticket #109 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: #3557 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 #3912 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: #3079 2016-09-01 10:50:34 +02:00
Daniel Maya 58f0ccae77 Added default event filter. Ticket #3930. 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 #3946. 2016-08-19 11:23:09 +02:00
m-lopez-f 9c256623d0 Fixed problems with group agents. Tiquet: #3079 
(cherry picked from commit 774b0f9cab)
 2016-08-16 10:44:21 +02:00
m-lopez-f 2217e9f908 Fixed problems with group agents. Tiquet: #3079 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 #3680 2016-06-01 18:11:47 +02:00
Arturo Gonzalez 9a9f8e17b8 Fixed events with/without tags table in advanced options. Ticket #3702 2016-05-25 17:40:34 +02:00
m-lopez-f 4b90a4f318 Fixed problems in new feature with url. Tiquet: #3079 2016-05-23 10:00:50 +02:00
m-lopez-f fe51e17511 Feature grouped by agent in event list. Supported to metaconsole. Tiquet: #3079 2016-05-23 09:45:42 +02:00
m-lopez-f 9f772e5091 Feature. new form of groped data in event list. Tiquet: #3079 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: #2856 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: #2794 2015-09-30 09:26:19 +02:00
Arturo Gonzalez Diaz 378bcf09c3 Fixed sound_events access in Pandora 6. Ticket #2691 2015-09-08 11:52:06 +02:00
Arturo Gonzalez Diaz ffb1d9fe98 Fixed error in tags table, the tables were unbalanced. Ticket #2648 2015-09-07 10:18:55 +02:00
m-lopez-f ea850a7d7a Fixed problems with access. Tiquet: #2479 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 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
m-lopez-f d57ba03f19 Fixed problems with load events when selected all agents,tiquet: #2241 2015-05-21 13:01:44 +02:00
Alejandro Gallardo Escobar 6af3133d42 Fixed some error 2015-05-08 16:09:12 +02:00
Alejandro Gallardo Escobar 90d5d3cae3 Changed an ajax call from synchronous to asynchronous 2015-04-21 13:58:28 +02:00
Alejandro Gallardo Escobar 190e105baa Merge branch 'develop' into feature/meta-agent-cache 2015-04-16 13:40:42 +02:00
Alejandro Gallardo Escobar a70d751c38 Removed the text of the agent search. 
The text 'All' makes no sense, cause the input searchs for it unnecessarily and the empty texts represents better the lack of filter.
 2015-04-16 13:16:50 +02:00
m-lopez-f 80144fe8bd Change in event save filter, name of label(META), tiquet: #2075 2015-04-15 12:39:50 +02:00
m-lopez-f 85b00c080c Draw pie with filter results and changed label, tiquet: #2076 2015-04-13 15:50:49 +02:00
m-lopez-f b533897415 Fixed problems with print pie, show more data that data in list event,Nodo and Meta, tiquet: #2076 2015-04-13 12:47:49 +02:00
m-lopez-f 2ac3c6f694 if user is strict user only see option all in select servers in filter eventlist, tiquet: #2074 2015-04-08 09:31:45 +02:00
m-lopez-f f23e6ceacf Change label text in save filter events in metaconsole, tiquet: #2053 2015-03-31 08:36:54 +02:00
mdtrooper 786c6efa4b Fixed the style of status message when edit a filter and added more information in the messages. 
(cherry picked from commit 085c4521d0)
 2015-03-25 11:24:08 +01:00
mdtrooper b4e74e8502 Fixed the insert duplicate event filter. 2015-03-23 19:18:08 +01:00
m-lopez-f 75dbb4dcb9 Changed visual of metaconsole 2015-03-23 17:28:38 +01:00