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

237 Commits

Author SHA1 Message Date
alejandro-campos 73f3dfac85 fix module string data with html special chars breaking html in page 2020-01-31 11:53:42 +01:00
Daniel Maya 891c517611 Fixed % with sprintf 2020-01-30 13:02:33 +01:00
Alejandro Campos dcd2aae3c5 Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024' 
# Conflicts:
#   pandora_console/extras/mr/35.sql
 2020-01-14 10:28:55 +01:00
Daniel Rodriguez 1cef8aa62f Merge branch 'ent-4658-cross-site-seguridad-base64' into 'develop' 
Changed the mode of obtain the title

See merge request artica/pandorafms!2743
 2020-01-09 16:46:58 +01:00
Alejandro Campos 0468c85a4d Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024' 
# Conflicts:
#   pandora_console/godmode/setup/setup_visuals.php
 2020-01-07 12:00:27 +01:00
alejandro-campos 5880bec88a changes in module data formatting when printed across the application and new setup options 2019-12-05 17:41:44 +01:00
Daniel Maya 791454ee87 Added Group by in tree view 2019-11-21 10:22:51 +01:00
Jose Gonzalez d7ca703c99 Cleaned the javascript call 2019-09-20 10:53:09 +02:00
marcos.alconada 83e5c14b1d add condition in query 2019-09-09 12:54:16 +02:00
samucarc 8f24c0cb18 Fixed conflict in CLI apply_policy 
Former-commit-id: ab512d9c2b88cd7042d6ae065251cd116b2ea5af
 2019-02-27 10:28:36 +01:00
alejandro-campos faae9c58b3 implement services tree view 
Former-commit-id: a081515f62ab210f96687577bfde60d5f6d23f23
 2019-02-22 14:09:27 +01:00
alejandro-campos eb56fd566c implemented services treeview 
Former-commit-id: d5d71442d0c6122ba91b160647559cdf03f55625
 2019-02-22 13:07:47 +01:00
artica b3da2803a4 Changed the format of the .php files 
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
 2019-01-30 16:18:44 +01:00
fermin831 2d2c465ff6 Removed unwanted traces 2018-10-17 15:43:26 +02:00
fermin831 0ca34c744d Fixed tags filter on Tree tags 2018-10-16 13:29:00 +02:00
fermin831 8d5953ce50 Removed unused code 2018-10-02 15:01:40 +02:00
fermin831 2d057f9ae9 Fixed tags problems with secondary groups in tree view 2018-10-02 13:35:48 +02:00
fermin831 81e15c4dc9 Fixed tags on Tree view 2018-09-28 09:37:16 +02:00
fermin831 da3061651b Fixed search agentes and modules in others tree views 2018-09-21 13:01:40 +02:00
fermin831 df660091ae Fixed search group in others tree views 2018-09-21 11:48:23 +02:00
fermin831 9c032f4dfe [Secondary groups] Fixed group report 2018-09-11 13:22:51 +02:00
daniel 022adeb24d fixed metaconsole tree view popup modules 2018-09-10 15:35:11 +02:00
daniel 729fe74758 fixed minor error tree view acl 2018-09-10 12:08:38 +02:00
daniel ac0f0536c7 performance improve view groups 2018-09-07 14:19:01 +02:00
daniel 4781809e14 fixed minor error not init agent in tree view node 2018-09-05 18:28:31 +02:00
daniel 82c4adc5c7 convert spaces to tab 2018-09-05 14:01:32 +02:00
daniel 7554906e59 minor refactorization tree view 2018-09-05 13:48:53 +02:00
daniel 51f71d1a07 fixed metaconsole tree view 2018-09-05 11:23:53 +02:00
daniel 2829ddd8dd clean main tree class code 2018-09-05 09:54:28 +02:00
daniel 718401467d put tree view in separate files 2018-09-04 11:51:36 +02:00
daniel 41761bc525 fixed tree view tags 2018-08-31 13:33:22 +02:00
daniel 3334138cb4 fixed tree view SO 2018-08-31 10:51:17 +02:00
daniel fb7def14af fixed tree view counter second level and module group view 2018-08-31 09:09:54 +02:00
daniel 6a124487a4 fixed module tree view 2018-08-30 12:23:35 +02:00
daniel b346e4dca9 refactorized group tree view 2018-08-29 13:55:50 +02:00
daniel 90d686a7ab fixed error in acl groups tree view 2018-08-29 09:16:07 +02:00
daniel 59e405c2b3 disabled modules search in tree view 2018-08-28 15:24:35 +02:00
daniel f9af750f47 fixed counters group tree view 2018-08-28 12:52:57 +02:00
daniel fbe4e15ca7 fixed filter tree view 2018-08-24 12:54:22 +02:00
daniel 9df565fae1 fixed metaconsole on performance changes 2018-08-23 16:33:20 +02:00
daniel 3e71513e4e performance tree view node 2018-08-23 14:49:09 +02:00
daniel 1f0b65eca6 fixed errors in tree view 2018-08-22 16:23:52 +02:00
fermin831 304a3b40c2 Fixed overwrite primery group if user has no permissions for this group on update agent 2018-08-16 12:48:44 +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 artica/pandorafms!1669
 2018-08-16 09:46:28 +02:00
fermin831 024a1cc1ee Fixed snapshot view in metaconsole 2018-08-14 13:21:32 +02:00
fermin831 4315cef4c9 [Secondary groups] Fixed modules permissions in some views 2018-08-08 11:49:54 +02:00
fermin831 18800feaae Refactorized snapshot link on node 2018-08-02 13:02:33 +02:00
tatiana.llorente@artica.es 965c6c839b Image for mode Quiet changed to blue - #2036 2018-06-26 12:31:23 +02:00
fermin831 a072cd34de Fixed tree view meta secondary groups repeated agents 2018-06-20 12:09:32 +02:00
daniel 9ecc770519 remove only average for all graphs and add zoom for sparse graph in stat-win and stat-win-interfaces 2018-06-13 11:02:58 +02:00
fermin831 1e1e6f5069 Do not use cache only when secondary groups are used in tree view 2018-04-11 11:04:21 +02:00
fermin831 28a3d3d8cc Deleted unwanted traces 2018-04-11 09:47:20 +02:00
fermin831 8ff29293a5 Avoid to add alert to total count in treeview 2018-04-10 18:20:51 +02:00
fermin831 9c82e3651a Avoid cache tree view 2018-04-10 17:59:34 +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 29a4e29cb9 [Secondary groups] Fixed display only secondary agents in tree view 2018-04-09 15:13:01 +02:00
fermin831 9972252a3f [Secondary groups] Fixed agent filter on node tree view 2018-04-09 12:40:11 +02:00
fermin831 89181b6f42 [Secondary groups] Added secondary groups to meta tree view 2018-04-09 12:33:03 +02:00
fermin831 310c2a6f15 [Secondary groups] Added secondary groups in tree view 2018-04-06 17:19:03 +02:00
enriquecd fa82f45d7d Fix not init counters final - #1454 2018-04-05 16:11:24 +02:00
enriquecd 8d39ae54fa Filter by not init agents and modules in tree view - #1454 2018-03-28 17:07:57 +02:00
fermin831 74f899736f [Snapshots] Fixed snapshots in metaconsole. Changed functionallity but preserve all way to work 2018-03-12 15:17:59 +01:00
fermin831 3fc010135b [Console Tree view] Removed empty childs 2018-02-27 11:04:49 +01:00
daniel 5d61ff5056 fixed error in ACL 2018-01-12 14:17:48 +01:00
daniel 7ea42dc5c5 add new filter tree view 2017-12-21 16:37:19 +01:00
Alejandro Gallardo Escobar 33ab429182 [Console] Now the group filter extract the searched groups and show their descendants 2017-12-05 09:43:37 +01:00
Alejandro Gallardo Escobar ecdbf9bcc4 [Console] Now the modules are shown correctly into the trees that nobody use 2017-10-26 11:51:15 +02:00
Alejandro Gallardo Escobar db056100e2 [Console > Tree view] Added a filter by group name and improved the filter by group id 2017-10-25 17:44:59 +02:00
Ramon Novoa c81f4fcc32 Performance improvements. 2017-10-13 15:10:10 +02:00
daniel 66e7d71858 fixed errors in search tree view 2017-03-09 12:16:35 +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
artu30 20fcd7ef32 Merge branch 'feature/ux_modules_hierarchy' into 'develop' 
Feature/ux modules hierarchy

See merge request !81
 2017-01-25 15:35:09 +01:00
Arturo Gonzalez e41af015fb UX console in progress... (Added hierachy system to modules in tree view) 2017-01-24 16:02:09 +01:00
Arturo Gonzalez 265e440a4f UX console in progress... (init treeview modules hierachy) 2017-01-23 12:55:15 +01:00
daniel 0ba7e76152 fixed errors in tree-view 2017-01-19 12:44:44 +01:00
enriquecd 21c2b93637 Case insensitive in tree view filter search #9 2017-01-13 11:01:08 +01:00
Daniel Maya 9a39798f43 Changed agent name in tree view, alert status, agent/alert view and agent/modules view. 2016-09-26 10:58:42 +02:00
m-lopez-f 581d3835db Fixed acl's permmissions. Ticket #3912 2016-09-08 16:06:12 +02:00
Arturo Gonzalez 437d7b539f Fixed error in tree view (meta and strict user with tags). Ticket3437 2016-03-02 15:25:40 +01:00
Arturo Gonzalez dc051c0c09 Thanks god for strict acl. Ticket#3391 2016-02-16 18:06:46 +01:00
Arturo Gonzalez daae8b9088 Fixed problem in tree view with parent nodes and permissions. Ticket#3388 2016-02-16 16:21:21 +01:00
Arturo Gonzalez 1c44ee0e90 Fixed extra time in Tree View 2016-01-29 11:50:16 +01:00
Arturo Gonzalez 10980a8106 Fixed minor bug with Tree view. 2016-01-28 14:38:23 +01:00
Arturo Gonzalez 0984a06f25 Fixed agents count in tree view. Ticket#3248 2016-01-28 11:09:09 +01:00
Arturo Gonzalez 4821378d4a Fixed problem when searches strange modules in tree (group tree). Ticket #3204 2016-01-14 12:54:17 +01:00
Alejandro Gallardo Escobar 571d5e571e Rewrited the processing, sorting and hierarchy building of the groups. 
Fixes ticket #3084.
 2015-12-16 11:43:37 +01:00
Alejandro Gallardo Escobar 85f7e49cd5 Modified the access permission to the modules when the user has common ACL 2015-09-30 18:32:55 +02:00
m-lopez-f 6b6f18a695 When user hace acl's and tags dont see data in tree view, its fixed. Tiquet:#2508 2015-07-21 13:26:07 +02:00
Alejandro Gallardo Escobar 89fe54d28a Error fixes 2015-07-06 18:26:44 +02:00
Alejandro Gallardo Escobar 5b36f3aacf Fixed an error on the filter 2015-07-02 13:11:24 +02:00
Alejandro Gallardo Escobar dde4e21e60 Fixed an error with the group counters of the tree view 2015-06-30 16:14:50 +02:00
Alejandro Gallardo Escobar 3b037caf32 Merge remote-tracking branch 'origin/develop' into features/oracle 2015-06-18 20:02:01 +02:00
mdtrooper 819b1d5d77 Clean the source code style. 2015-06-08 09:32:01 +02:00
Alejandro Gallardo Escobar eb965ff7da Fixed the data retrieving with oracle databases 2015-05-14 17:57:59 +02:00
Alejandro Gallardo Escobar 1121fbd8b7 Fixed problems related with the oracle compatibility 2015-04-30 20:11:07 +02:00
Alejandro Gallardo Escobar 3264c65ef8 Fixed some problems with oracle compatibility 2015-04-30 12:35:42 +02:00
Alejandro Gallardo Escobar 8a348c2411 Merge remote-tracking branch 'origin/develop' into feature/meta-agent-cache 2015-04-23 15:02:27 +02:00
m-lopez-f 896e6329c8 Fixed problems with title when open graph in tree view in meta and nodo, tiquet: #2077 2015-04-21 10:44:50 +02:00
Alejandro Gallardo Escobar 8826f0c80c Adapted the code to improve the performance of the tree view on the metaconsole with the 'tmetaconsole_agent' 2015-04-17 16:12:51 +02:00
m-lopez-f a756ef1ab5 Fixed filter by name module in tree view, Node and Meta. tiquet: 2056 2015-03-31 14:46:43 +02:00