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

286 Commits

Author SHA1 Message Date
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
Fermin 0d6115726a [Rebranding] Open include root files (except networkmaps related sources) 2018-05-11 12:49:16 +02:00
Alejandro Gallardo Escobar 0b1546be22 Fixed a date 2018-04-30 15:35:41 +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 c88e6e703a [Secondary groups] Fixed duplicated agents in group view and agent detail 2018-04-04 11:17:08 +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
enriquecd 078b370cbd Hide passwords fields data in treeview and events - #2030 2018-03-22 13:10:25 +01:00
fbsanchez 407fbf450f Fixed permission checks in event_acl 
Added event response macro _group_custom_id_
 2018-02-16 15:09:37 +01:00
enriquecd 5c0f0de1e4 Add module critical instructions when create an event - #1862 2018-02-06 16:01:32 +01:00
vgilc 60486c8a1e Merge branch '1659-Informe-de-eventos-de-módulos-en-plantillas-de-informes-de-la-metaconsola--Carrefour]-dev' into 'develop' 
Fixed reporting_event_report_module in metaconsole

See merge request artica/pandorafms!1128
 2017-12-21 09:53:47 +01:00
vgilc 45c642a6a0 Merge branch 'ent-1435-incluir-macros-en-event-responses' into 'develop' 
Ent 1435 incluir macros en event responses

See merge request artica/pandorafms!1100
 2017-12-21 09:46:55 +01:00
daniel e0b90f2be0 optimization view events 2017-11-30 14:00:08 +01:00
danielmaya a3e47fb977 Fixed reporting_event_report_module in metaconsole 2017-11-28 15:56:46 +01:00
fermin831 2ef9d884ee Added spanish event responses new macros documentation 2017-11-20 11:14:26 +01:00
fermin831 492b55a713 Added custom_data to events responeses macros 2017-11-17 15:17:08 +01:00
fermin831 7fb8406bc0 Added several macros to events responses 2017-11-17 14:50:23 +01:00
vgilc 3493b9c15c Revert "code backup" 
This reverts commit b9851a3a71
 2017-11-13 10:21:38 +01:00
Daniel Maya b9851a3a71 code backup 2017-10-31 11:51:19 +01:00
Daniel Maya 718a2dbaff Fixed in visual map 2017-10-30 17:57:47 +01:00
Daniel Maya 7a061edb66 group by id_agent in group events 2017-09-28 16:46:40 +02:00
fermin831 89fc3c457a Fixed no os_version on event agent view 2017-09-11 17:54:28 +02:00
vgilc ae0196f7b5 Merge branch '1169-Pandora-FMS-Aplicación-movil-Error-en-ordenacion-de-eventos' into 'develop' 
Fix bad ordination in mobile pandora events list - #1169

See merge request !746
 2017-09-11 09:41:56 +02:00
enriquecd 418906add5 Fix bad ordination in mobile pandora events list - #1169 2017-08-22 17:24:26 +02:00
enriquecd 031a70cc51 Add instructions,user and force_create_agent parameters to CLI event_creator - #309 2017-08-22 10:43:22 +02:00
Daniel Maya 06eadbaf81 Fixed urlencode in event popup 2017-07-19 10:52:01 +02:00
Arturo Gonzalez 9348562ee4 Added good match to tags list 2017-06-28 16:20:57 +02:00
daniel d3a0c4b52b fixed errors in pandora revent 2017-06-21 14:34:06 +02:00
enriquecd 131753cfba Inprove event title format and alias rather name - #523 2017-06-12 14:34:03 +02:00
enriquecd df715561d7 Format module inventary to show only changes on events - #523 2017-05-24 18:24:53 +02: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
daniel 8f8a17bf24 fixed alias for name in reports 2017-02-27 16:48:28 +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 550a00cec7 Changed the agent name by its alias 2017-02-20 15:32:49 +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 5dad591b02 fixed errors in reports evnts 2017-02-02 10:13:58 +01:00
daniel 8006c1fc0b fixed pdf reports events 2017-01-18 10:37:08 +01:00
daniel 99aa41b32a fixed reports events 2017-01-13 14:09:56 +01:00
daniel 993bad314d fixed errors in events reports #135 2017-01-11 13:26:50 +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
daniel 4afaf5190a fixed errors in reports alerts 
(cherry picked from commit 85dddf0b56)
 2017-01-03 19:33:11 +01:00
daniel 462ff97b0e fixed order by events reports 
(cherry picked from commit bda0177ad2)
 2017-01-02 16:09:07 +01:00
daniel 8aa1818f9a fixed errors in reports events for all groups 2016-12-30 13:14:19 +01:00
m-lopez-f 031ff4233a Feature: Add new filter in aget/group events report. Ticket: #4243 2016-12-01 16:18:37 +01:00
m-lopez-f dfda3bcda5 Fixed typo error 
(cherry picked from commit 7c33532d68)
 2016-11-25 10:37:52 +01:00
m-lopez-f 935b426a83 Add history search of events in reports, only when history event db is active. Ticket: #85 2016-11-24 15:28:21 +01: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
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
m-lopez-f 051ee37696 Fixed problems with sql in metaconsole when used group agents in events list. Ticket: #3079 2016-08-31 14:43:40 +02:00
m-lopez-f 2217e9f908 Fixed problems with group agents. Tiquet: #3079 2016-07-22 16:08:45 +02:00
Alejandro Gallardo Escobar a87de02e0b Removed the tinyMCE from the agent description and custom fields. Removed the url injection feature from the agent description. Added the url injection feature to the agent custom fields of some sections 
(cherry picked from commit c4bbe38b69e9b076b45871bc35b8c861b8ed2cc9)
 2016-06-08 19:17:39 +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
mdtrooper ab46cde699 Cleaned source code. 2016-01-27 13:15:23 +01:00
mdtrooper fe8300655d Cleaned source code. 2016-01-27 13:08:11 +01:00
m-lopez-f 5e69d3a110 Fixed problem with Event report agent, when is metaconsole. Tiquet: #3045 
(cherry picked from commit 59e0387069)
 2015-12-09 12:44:53 +01:00
m-lopez-f a72f6e051b Fixed problems with show comment in events. Tiquet: #2820 2015-10-01 09:26:49 +02:00
m-lopez-f 4818b01e4f Add system to view instructions in details events. Tiquet: #2805 2015-09-25 15:43:34 +02:00
Arturo Gonzalez Diaz 8f5cfb877a Replaced the word that should never be named by "Severity" 2015-09-14 14:07:21 +02:00
Arturo Gonzalez Diaz bd432db9fd Fixed sql error in statistics (oracle). Ticket #2690 2015-09-08 10:40:12 +02:00
Alejandro Gallardo Escobar 37b55517e1 Error fixes 2015-07-02 18:23:13 +02:00
Alejandro Gallardo Escobar 3b037caf32 Merge remote-tracking branch 'origin/develop' into features/oracle 2015-06-18 20:02:01 +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
m-lopez-f 866cdb908e No show count events group by status(validate,not validate) in statics events. Tiquet: #2306 2015-06-05 10:21:24 +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 23b199d7cd Fixed the function 'events_create_event' for oracle databases 2015-05-25 19:53:20 +02:00
mdtrooper 8107a78791 Added support to metaconsole in function 'events_get_group_events' 2015-05-22 17:04:23 +02:00
m-lopez-f a19e4cdbf5 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-05-22 14:33:56 +02:00
m-lopez-f 62ff5eaef4 Add new macro Events response, tiquet:#2253 2015-05-22 14:33:43 +02:00
mdtrooper f009758e93 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-05-22 12:31:49 +02:00
mdtrooper 2fe85510a7 Fixed PHP Warnings. 2015-05-22 12:31:33 +02:00
Alejandro Gallardo Escobar 6a533969ef Improved the element concatenation 2015-05-22 11:05:53 +02:00
m-lopez-f 400cc3c587 If possible selected None own in owner event, tiquet: #2250 2015-05-21 15:23:37 +02:00
Alejandro Gallardo Escobar 33867fcc80 Fixed the function "events_get_count_events_validated" 2015-05-21 13:28:17 +02:00
Alejandro Gallardo Escobar 5695611ba5 Added an order field to the group events query for oracle 2015-05-21 12:18:31 +02:00
Alejandro Gallardo Escobar b584f94b10 Successfully fixed and simplified the evil query of grouped events 2015-05-21 12:01:22 +02:00
Alejandro Gallardo Escobar 137acdb232 Merge remote-tracking branch 'origin/develop' into features/oracle 
Conflicts resolved:
	pandora_console/include/functions_reporting.php
 2015-05-19 19:16:35 +02:00
Alejandro Gallardo Escobar e47af5993f Minor fix 2015-05-11 14:16:44 +02:00
mdtrooper 73e0a74a1a Merge branch 'develop' into feature/#1978-REESCRITURA_DEL_MOTOR_DE_INFORMES 
Conflicts:
	pandora_console/godmode/reporting/reporting_builder.item_editor.php
	pandora_console/include/functions_reporting.php
 2015-05-06 17:02:40 +02:00
Alejandro Gallardo Escobar c95f70dde7 Error fixes related with the improved oracle compatibility 2015-05-04 18:27:23 +02:00
mdtrooper bc9918707a Working in the refactoring the code of reports (event_report_group) and added the filter by text. TICKET: #2066 2015-04-27 13:42:03 +02:00
mdtrooper 55dc1a278e Working in the refactoring the code of reports (event_report_module). 2015-04-24 14:24:17 +02:00
m-lopez-f dc09a9a14e Change visual and add new images 2015-04-21 17:26:20 +02:00
m-lopez-f 2d9168ac8f Changed styles from views in nodo 2015-04-15 09:45:13 +02:00
m-lopez-f f3de8d5bc8 Changed visual of tactical view 2015-04-14 09:36:41 +02:00
m-lopez-f ff7fd3d8a7 Fixed menu and change visual 2015-04-06 12:44:35 +02:00
Alejandro Gallardo Escobar f462e38a7f Now the data handling of the function 'events_page_details' id done connected to the node when necessary 2015-03-25 19:57:34 +01:00
Alejandro Gallardo Escobar 08d93c8b28 Now the 'avg_only' option is enabled by default for the metaconsole users 2015-03-25 19:20:48 +01:00
Alejandro Gallardo Escobar 481addb514 ACL improvements 2015-03-24 19:10:09 +01:00
Alejandro Gallardo Escobar e3c1acfcf4 Merge branch 'feature/ticket#1981-Direct-graphs' into develop 2015-03-23 20:58:41 +01:00
Alejandro Gallardo Escobar da8570d3b9 Added support to show the interface traffic graphs through the metaconsole and improved the ACL 2015-03-23 20:51:44 +01:00
mdtrooper 118b980f4e Fixed the view of list event filters with a user is setted strict_acl. #2017 2015-03-23 14:17:06 +01:00
Alejandro Gallardo Escobar 7fda8a296d Now some monitor graphs are shown in 'only average' mode when accessing it from the metaconsole 2015-03-13 14:43:30 +01:00
Vanessa Gil 8e3ccd84bc Fixed bug #1958. 2015-03-12 15:32:33 +01:00
mdtrooper acb37f591c Fixed the event with filter EVENT_CRIT_WARNING_OR_CRITICAL in function 'events_get_events'. TICKET: #1909 2015-03-12 12:31:15 +01:00
mdtrooper 18fd20c078 Show group name instead the icon in metaconsole. TICKET: #1501 
(cherry picked from commit 1141127a34)
 2015-03-09 15:14:33 +01:00
mdtrooper 0473856048 Killing pink unicorns and magic numbers. 2015-02-16 18:37:16 +01:00