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

576 Commits

Author SHA1 Message Date
daniel 16be9488c8 Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP 
Conflicts:
	pandora_console/include/functions_graph.php
 2018-10-11 13:06:17 +02:00
fermin831 2693bbe209 Merge remote-tracking branch 'origin/develop' into 2737-Optimización-de-tags-dev 
Conflicts:
	pandora_console/godmode/massive/massive_delete_modules.php
	pandora_console/operation/agentes/ver_agente.php
 2018-10-10 19:39:27 +02:00
daniel a59ecc7ef3 fixed minor error counters alert fired in module_group view 2018-10-05 11:55:06 +02:00
danielmaya e8621e54e5 Updated tags optimization 2018-10-05 09:40:08 +02:00
daniel 0ce7d3a2ed fixed errors php7 2018-10-04 17:17:39 +02:00
fermin831 7ffeaaf50b [Tags performance] fermin revision 1 2018-10-03 11:13:52 +02:00
danielmaya 942c5391f9 Fixed agents/modules view. it shows nothing if there are no agents and modules selected 2018-10-03 10:31:45 +02:00
tatiana.llorente@artica.es 2dd10a4328 Added number of times an alert is fired - #2827 2018-10-02 12:35:20 +02:00
fermin831 28b879f058 [Tags performance] Added TODOS to revise agents_get_modules 2018-10-02 09:48:29 +02:00
fermin831 995bfe0fad Removed unused code 2018-10-01 17:04:00 +02:00
vgilc f73b4a55e6 Merge branch '2741-Refactorizar_vista_module_groups' into 'develop' 
refactoriced view module_groups

See merge request artica/pandorafms!1788
 2018-10-01 10:59:09 +02:00
danielmaya 453fb3f67b TODO List 2018-09-27 13:30:32 +02:00
daniel 26c08d9309 refactoriced view module_groups 2018-09-20 15:51:36 +02:00
Alejandro Gallardo Escobar 5f732d035b Now the integer numbers of the Y axis of the realtime graphs are shorter 2018-09-17 13:13:10 +02:00
manuel.montes a721eadcbd Fixed bug in the construction of the name of the xml file 2018-09-07 08:36:06 +02:00
vgilc 69545d7ed8 Merge branch 'ent-2153-vistas-en-las-que-no-se-ha-tenido-en-cuenta-los-grupos-secundarios' into 'develop' 
Ent 2153 vistas en las que no se ha tenido en cuenta los grupos secundarios

See merge request artica/pandorafms!1708
 2018-08-27 09:10:00 +02:00
fermin831 399c9c2d58 [Secondary groups] Fixed agent/modules view 2018-08-21 13:33:16 +02:00
Alejandro Gallardo Escobar 28336d3e1a Update realtime_graphs.js 2018-08-20 09:53:11 +02:00
Alejandro Gallardo Escobar 5934f141a8 Fixed the incremental realtime charts 2018-08-17 13:17:27 +02:00
Alejandro Gallardo Escobar 568484cf6e Fixed the incremental mode of the realtime charts and overall improvements 2018-08-02 14:59:10 +02:00
manuel.montes 7da00bca8a Fixed bug in realtime_graphs.php 2018-06-18 11:12:38 +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
daniel badfd83b0d Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 
Conflicts:
	pandora_console/include/functions_graph.php
	pandora_console/include/graphs/fgraph.php
 2018-06-06 11:57:02 +02:00
daniel 89a481c452 fixed errors in graphs 2018-06-06 11:18:39 +02:00
danielmaya f8aa351987 Fixed line graph and box item when exporting visual consoles 2018-06-05 15:14:27 +02:00
danielmaya 89aa85626c Fixed export and import visual consoles 2018-06-04 15:56:17 +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
fbsanchez 2f8cdb5ea5 Added check_login to plugin registration 2018-05-28 11:31:09 +02:00
danielmaya 3f1a1a816b Fixed id_agente lost in insert_data 2018-05-24 17:24:53 +02:00
fermin831 43447bbee4 [Rebranding] Minor ended fixed 2018-05-23 18:19:24 +02:00
fermin831 e71fd399fb Merge branch 'develop' into 2106-intracom-rebranding 
Conflicts:
	pandora_console/godmode/admin_access_logs.php
	pandora_console/include/javascript/functions_pandora_networkmap.js
 2018-05-22 19:29:46 +02:00
Alejandro Gallardo Escobar cada865042 Fixed XSS vulnerability 2018-05-18 11:00:41 +02:00
fermin831 d8f63e9963 [Rebranding] Some missing string in extension 2018-05-14 17:51:10 +02:00
fermin831 34b953964a [Rebranding] Added rebranding to extensions 2018-05-09 13:42:20 +02:00
fermin831 bd3f0712f1 Added separated window view to SNMP realtime graphs 2018-05-04 10:58:37 +02:00
fermin831 8bc9805288 [Realtime Graphs] Added the hidden type snmp_module 2018-05-03 12:57:24 +02:00
fermin831 1001240cf4 [SNMP] Fixed translation of custom mibs, added custom description data and change style of OID details 2018-03-15 16:03:46 +01:00
danielmaya d8ad6d514e Deleted console.log 2018-02-20 11:42:08 +01:00
danielmaya 17a1f8f390 Fixed group and agents filter in agents/modules 2018-02-20 11:36:30 +01:00
daniel ad0b463d13 fixed errors acl 2018-01-30 17:44:51 +01:00
daniel 955c183cd8 fixed error ip validate 2018-01-08 11:12:07 +01:00
daniel d2bc062766 fixed errors extensions agent-modules and recursion groups 2018-01-05 10:29:46 +01:00
danielmaya 6d4f460ef8 Fixed get oid 2017-12-05 12:13:38 +01:00
vgilc 2531e43d4a Merge branch '1263-Mensajes-de-Visor-de-logs-del-sistema' into 'develop' 
Change phrases in system logfile viewer - #1263

See merge request artica/pandorafms!968
 2017-11-29 17:03:42 +01:00
enriquecd 130349e955 Put togehter error and info messages in db_status extension - #1530 2017-11-07 18:45:08 +01:00
enriquecd 8b11ba0e07 Merge branch 'develop' into 1125-Vista-de-Agente-Modulo 
Conflicts:
	pandora_console/extensions/agents_modules.php
 2017-10-30 15:15:39 +01:00
vgilc f654bdd241 Merge branch '1113-Enumeración-recursiva-de-grupos-en-vista-agente-modulo-3805-media-open' into 'develop' 
Add recursion group search for agent/module view and angent/module item in reports - #1113

See merge request artica/pandorafms!812
 2017-10-26 11:07:46 +02:00
enriquecd 4473d16727 Change phrases in system logfile viewer - #1263 2017-10-25 11:35:58 +02:00
enriquecd 5812b56e0b Delete system info section file - #1350 2017-10-09 15:50:51 +02:00
daniel b431be44cd fixed minor error in db status 2017-10-06 09:40:48 +02:00
enriquecd 570a209861 Db maintenance section is now called Admin tools with only admin access permission, erase all subsection except db interface and db status - #1350 2017-10-04 19:02:45 +02:00
daniel b23f83036c fixed errors in extension db status 2017-09-25 17:23:57 +02:00
enriquecd dc33195358 Add recursion group search for agent/module view and angent/module item in reports - #1113 2017-09-11 17:20:07 +02:00
vgilc df1489e08f Merge branch '1194-Extension-DB-inface-en-panel-de-ultima-actividad' into 'develop' 
Fix dbmanager when insert db activity in activity login info panel - #1194

See merge request !739
 2017-09-11 09:42:56 +02:00
fbsanchez 629f5aa237 Merge branch 'develop' into 1256-cargarse-todo-rastro-de-ssh-gateway-y-vnc 2017-09-04 16:20:20 +02:00
fbsanchez ad0bedb4a8 Removed VNC & SSH extensions, go ehorus! 2017-09-01 13:49:23 +02:00
enriquecd 29703c708a Disable autosubmit in agent module view - #1125 2017-08-28 11:14:04 +02:00
fbsanchez ef132fde80 Removed sshgateway extension 
Ehorus!!!!!
 2017-08-21 19:48:19 +02:00
enriquecd a399652873 Fix dbmanager when insert db activity in activity login info panel - #1194 2017-08-21 11:29:58 +02:00
vgilc 50a7ea3dd9 Merge branch '1045-Insert-data-pierde-información-dev' into 'develop' 
Fixed agent lost in insert data

See merge request !614
 2017-08-18 12:36:06 +02:00
vgilc 94f6683c16 Merge branch '1114-En-la-vista-de-agente-modulo-se-distorsionan-las-imágenes-2' into 'develop' 
Change agent / module icons height a width - #1114

See merge request !659
 2017-07-28 10:25:14 +02:00
vgilc f855d25b54 Merge branch '1030-DB-Status-no-va' into 'develop' 
Change connection data for mysql queries - #1030

See merge request !603
 2017-07-13 11:29:53 +02:00
enriquecd d9e6585234 Change agent / module icons height a width - #1114 2017-07-12 11:20:19 +02:00
Arturo Gonzalez 242667e162 Fixed selector 2017-06-27 11:10:07 +02:00
Daniel Maya 09d6991c92 Fixed agent lost in insert data 2017-06-22 17:00:30 +02:00
enriquecd bd537cd891 Change connection data for mysql queries - #1030 2017-06-20 17:45:01 +02:00
Daniel Maya c678d8ba50 Merge branch 'develop' into '330-Agentes-sin-alertas-dev' 
# Conflicts:
#   pandora_console/include/functions_ui.php
 2017-06-20 11:06:24 +02:00
vgilc 7bfd3254a7 Merge branch '656-changes-in-system-log-viewer-dev' into 'develop' 
Added changes

See merge request !518
 2017-06-14 11:32:44 +02:00
vgilc 49e3beea27 Merge branch '869-Insert-data-no-funciona' into 'develop' 
Fix insert data extension, bad parameters in xml format - #869

See merge request !492
 2017-06-14 11:30:55 +02:00
Daniel Maya f72f61c49e Added new functionality to create alerts on modules without alerts 2017-06-01 16:54:51 +02:00
Arturo Gonzalez 6bf672a846 Added changes 2017-05-26 14:47:37 +02:00
enriquecd 61eb5e755e Fix insert data extension, bad parameters in xml format - #869 2017-05-19 14:00:47 +02:00
m-lopez-f bdde4e89e0 Only show files with extension is ptr. 2017-05-05 12:13:33 +02:00
Daniel Maya eaf376094e Fix problem with filters in agents / modules 2017-05-04 17:12:32 +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
m-lopez-f b0f600e9f0 Add AW acl in network exteension tool. Gitlab: #498 2017-03-09 11:55:12 +01:00
m-lopez-f 7f0359283d Fixed problems with ACL permmisions. Gitlab: #451 2017-03-06 12:54:48 +01:00
m-lopez-f 0b943fcf08 Remove debug traces 2017-03-03 13:27:02 +01:00
Daniel Maya 811dc3ba8f Added alias when group changed 2017-02-27 17:41:46 +01:00
Alejandro Gallardo Escobar 3d8af42834 Changed the agent name by its alias 2017-02-22 16:43:28 +01:00
daniel bf29d4c5f9 fixed error in view agent/module 2017-02-21 17:21:10 +01:00
Daniel Maya 76cb61f288 Changes for the merge 2017-02-21 15:31:20 +01:00
Alejandro Gallardo Escobar 58617c00aa Merge branch 'develop' into feature/alias_friendly_name 2017-02-20 18:52:18 +01:00
daniel 65047c23a5 fixed errors in agent/module 2017-02-20 16:16:53 +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 c7fce2d670 fixed error in dbmanager 2017-02-16 15:02:36 +01:00
m-lopez-f af65ec1910 Disable default extension Matrix, Vna and SSH. Gitlab: #251, #259 2017-02-15 13:42:40 +01:00
daniel 93e1c72949 fixed forms in agents/modules 2017-02-13 14:18:48 +01:00
daniel f3d18132f3 fixed minor error in net_tool 2017-01-19 13:24:57 +01:00
daniel e3c5121068 fixed minor error extensions 2017-01-16 08:37:45 +01:00
Arturo Gonzalez 08886f6a1e Added "var" to js variable 2016-12-01 09:42:13 +01:00
Arturo Gonzalez 8c7c1e6916 Added policy agents exportation and importation. Ticket #4107 2016-11-24 16:05:52 +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
enriquecd f4a1358a61 Remove "updated in real time" message because is confused, really it must refer if data source is db or cache #4093 2016-11-02 17:20:17 +01:00
enriquecd 559902275f OUM online loses format #4117, vertical center Agent/Module Group cells #59 
(cherry picked from commit 37091a0c31)
 2016-10-27 16:26:25 +02:00
daniel d5d1727fe7 add new field for modules 2016-10-14 10:16:21 +02:00