Commit Graph

253 Commits

Author SHA1 Message Date
José González bdc4d0a8b1 Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'"
This reverts merge request !4302
2021-11-04 16:28:15 +01:00
Jose Gonzalez c0abe5edb9 Fix merge 2021-11-04 16:00:05 +01:00
Jose Gonzalez 8696d21a42 Fixed any minor bugs 2021-09-29 17:03:13 +02:00
fbsanchez fe42a8782b Updated messages in centralised environment status check 2021-09-23 11:16:48 +02:00
fbsanchez 4e1110a052 MQ up to down connections (MC => NODES) 2021-06-28 21:21:31 +02:00
fbsanchez eec373e896 Added link to MC place where user must manage the stuff when in centralised environment and ui_get_meta_url 2021-06-24 19:48:07 +02:00
Daniel Barbero Martin 8c7654cd2d Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
Conflicts:
	pandora_console/godmode/setup/os.php
	pandora_console/include/styles/pandora.css
	pandora_console/operation/users/user_edit.php
2021-05-28 08:26:19 +02:00
Daniel Barbero Martin 6c305833bf fix groups, module_groups, network_components user_edit synch 2021-05-18 17:18:54 +02:00
José González ab984b8c32 Added standard headers 2021-04-30 13:50:58 +02:00
marcos 0ff28fb9a2 fixed error with icon groups policies 2021-04-22 16:09:05 +02:00
Jose Gonzalez 3d359dab36 Fixed merge with 7161 2021-04-13 12:55:35 +02:00
Daniel Maya 9bbac06771 Ent 7161 cambiar opciones de skin en usuarios y grupos 2021-04-13 09:26:50 +00:00
José González 4a028b2ee3 Merge branch 'develop' into 'ent-6387-limitar-agentes-por-grupo'
# Conflicts:
#   pandora_console/extras/mr/46.sql
2021-04-13 07:52:48 +00:00
Jose Gonzalez 62264c9d07 Added boolean casting for check acl 2021-04-09 14:05:33 +02:00
Jose Gonzalez f8d4039314 Fixed merges 2021-04-09 10:34:25 +02:00
fbsanchez c64f05dc17 minor fix while empty search condition 2021-04-07 20:31:24 +02:00
Luis 4ab7b1a135 Ent 6952 bug group creation user admin no all 2021-04-07 08:11:35 +00:00
Daniel Barbero Martin b78f4093ac fixed error tree groups agent edition metaconsole 2021-03-15 13:31:24 +01:00
Marcos Alconada d8a628b1c4 Ent 6781 revision de estilos visuales y eliminacion de sistemas skins 2021-03-11 14:40:23 +00:00
marcos 45a2b7141d fixed error with group cordinator profile with agent management meta 2021-02-17 14:07:18 +01:00
Jose Gonzalez 26a788b2e9 Added control for max agents in groups 2021-01-26 12:35:08 +01:00
José González 623b729001 Merge branch 'develop' into 'ent-1175-copyright-actualizados'
# Conflicts:
#   pandora_agents/pc/Win32/pandora_agent.conf
#   pandora_agents/win32/bin/pandora_agent.conf
#   pandora_console/extensions/realtime_graphs.php
#   pandora_console/godmode/snmpconsole/snmp_alert.php
#   pandora_console/include/functions_ui.php
#   pandora_console/install.php
#   pandora_console/operation/agentes/realtime_win.php
2020-12-14 11:10:35 +01:00
Daniel Maya 296cb9125e Ent 5316 anadir seccion credential store al menu de discovery 2020-12-03 14:48:12 +01:00
Jose Gonzalez 649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
Luis Calvo 31a8eefd2f Fixed bug allowing updating group with duplicated name 2020-11-04 16:22:44 +01:00
fbsanchez f744261821 minor fix 2020-10-27 16:03:35 +01:00
fbsanchez 27c2fa0860 minor fix 2020-10-05 11:52:41 +02:00
Marcos Alconada 48e19f3b59 add condition 2020-09-22 12:15:05 +02:00
Luis 7b09c1e943 Ent 6029 meta groups delete bug 2020-08-07 09:40:46 +02:00
marcos 415a8aa8b6 ignore keys on xss manage angent groups 2020-06-19 10:44:43 +02:00
marcos b3a270d0b3 fixed security error on manage agent group 2020-06-09 12:43:58 +02:00
Manuel Montes 611291c217 Ent 5428 revision total de ayudas hint wiki 2020-05-29 11:37:06 +02:00
tatiana e939ac05a8 Delete groups in nodes when deleting in meta - #5138 2020-03-19 13:11:06 +01:00
fbsanchez 7d52614064 Ent 4615 implementar cifrado en los contenedores de credenciales usando el sistema de cifrado interno de pandora 2019-09-24 11:25:53 +02:00
fbsanchez 6ac21acd39 wip agent deployment scan 2019-07-25 18:35:51 +02:00
fbsanchez 3bbd01026e WIP agent deployment 2019-07-15 19:37:04 +02:00
fbsanchez 9fb32c4699 Deployment area single targets 2019-07-12 18:29:58 +02:00
fbsanchez 47cc0d9d6e WIP: Agent deployment center 2019-07-10 23:59:09 +02:00
fbsanchez 18d8f90f90 Credential store upgrade Azure 2019-07-03 16:04:40 +02:00
fbsanchez e1bf12a1fb Credential store 2019-06-25 18:21:23 +02:00
fbsanchez 22d936d4f3 credential store some js controls 2019-06-25 16:43:38 +02:00
fbsanchez 5658b98f0b intuitive credential store 2019-06-21 23:51:22 +02:00
fbsanchez e9ef9b64a3 credential_store 2019-06-21 19:34:47 +02:00
fbsanchez 6682bad19f first steps credential store 2019-06-21 12:03:25 +02:00
fbsanchez 4a42756ec6 group_management styles profiles 2019-05-29 15:44:51 +02:00
manuel 6bd8221bc0 changed helps
Former-commit-id: 3319f3d09d695e2b9f2958f1ac013eb2e0a001b4
2019-04-29 14:36:02 +02:00
Tatiana Llorente f497d3bd2e Added class to action buttons and moved checkbox to the left side
Former-commit-id: 1d7ba8fa06e734a3e45f7bc1ca2f78d0d8978122
2019-04-02 13:42:30 +02:00
Tatiana Llorente 26451c41a1 New design for the tables - #3707
Former-commit-id: 17d66da1d4d0365db38923e15e9c261c12d23544
2019-03-29 11:05:52 +01:00
Tatiana Llorente 845cb85c55 New design for tables - #3707
Former-commit-id: 923414d8bf98d6264e6cebc27706118e16710b70
2019-03-27 17:03:55 +01:00
daniel 504a8e9d1a fixed warnings php
Former-commit-id: d21cb02113c65a7f50a5e29f7f536e85ba5cb945
2019-02-25 13:02:39 +01:00
Tatiana Llorente 4c2215a3db Merge remote-tracking branch 'origin/develop' into 3446-Imagen-grupos-no-se-muestra-None
Conflicts:
	pandora_console/install.php


Former-commit-id: bc20f50737c115ade0034b4ca9e6d4cab26d35e6
2019-02-07 08:59:45 +01:00
Tatiana Llorente b8aab972c9 Merge remote-tracking branch 'origin/develop' into 3446-Imagen-grupos-no-se-muestra-None
Conflicts:
	pandora_console/godmode/groups/group_list.php


Former-commit-id: 6f928cc0a3ce2d4822affc7444254393d1d47b69
2019-02-06 15:14:22 +01:00
Tatiana Llorente 9baa3dcfa2 Merge remote-tracking branch 'origin/develop' into 3358-Mejora-en-la-aplicación-de-estilos
Conflicts:
	pandora_console/extensions/agents_modules.php
	pandora_console/extensions/module_groups.php
	pandora_console/general/login_page.php
	pandora_console/godmode/alerts/alert_list.builder.php
	pandora_console/godmode/alerts/alert_list.list.php
	pandora_console/godmode/gis_maps/configure_gis_map.php
	pandora_console/godmode/groups/group_list.php
	pandora_console/godmode/reporting/visual_console_builder.data.php
	pandora_console/godmode/reporting/visual_console_builder.editor.php
	pandora_console/godmode/reporting/visual_console_builder.elements.php
	pandora_console/godmode/setup/setup_visuals.php
	pandora_console/include/chart_generator.php
	pandora_console/include/functions_networkmap.php
	pandora_console/include/functions_pandora_networkmap.php
	pandora_console/include/functions_ui.php
	pandora_console/include/functions_visual_map_editor.php
	pandora_console/include/styles/common.css
	pandora_console/include/styles/countdown.css
	pandora_console/include/styles/datepicker.css
	pandora_console/include/styles/dialog.css
	pandora_console/include/styles/help.css
	pandora_console/include/styles/menu.css
	pandora_console/include/styles/pandora.css
	pandora_console/include/styles/pandora_forms.css
	pandora_console/operation/agentes/estado_monitores.php
	pandora_console/operation/agentes/interface_traffic_graph_win.php
	pandora_console/operation/agentes/realtime_win.php
	pandora_console/operation/agentes/stat_win.php
	pandora_console/operation/events/events.php
	pandora_console/operation/snmpconsole/snmp_view.php
	pandora_console/operation/tree.php
	pandora_console/operation/visual_console/render_view.php


Former-commit-id: 87793fc5a319121753f591da7949ad0ff3bd72b1
2019-02-05 09:23:53 +01:00
artica b3da2803a4 Changed the format of the .php files
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
2019-01-30 16:18:44 +01:00
tatiana.llorente@artica.es 7bc5fb47a0 Don't show image for groups without icon - #3446
Former-commit-id: 6a67e368a2aef7f2df04a3937a0466064fa6894e
2019-01-28 17:06:35 +01:00
tatiana.llorente@artica.es f5c96b7e5d New organization of CSS files - #3358
Former-commit-id: 8512adc7742eecb64db2b0ee539acfddd33406c2
2019-01-24 11:10:49 +01:00
daniel 0c853a83d1 add new tree view edition group 2018-09-18 09:28:22 +02:00
daniel 5d6f414d68 fixed view manage groups 2018-09-13 16:28:08 +02:00
fermin831 e762b7322c Fixed detection disabled on serialized ajax get groups and clean call in metaconsole 2018-07-19 13:49:51 +02:00
fermin831 2d45c0b39f Added serialized to groups ajax calls 2018-07-19 11:02:20 +02:00
fermin831 358847ecef [Rebranding] Open godmode/<others> 2018-05-10 15:43:46 +02:00
Alejandro Gallardo Escobar 4239b669f2 Added a new confirm message when trying to delete groups with children 2018-04-23 16:26:35 +02:00
daniel ad0b463d13 fixed errors acl 2018-01-30 17:44:51 +01:00
daniel d2bc062766 fixed errors extensions agent-modules and recursion groups 2018-01-05 10:29:46 +01:00
danielmaya 43ec1cb7f4 Fixed blocked group in group_list 2018-01-04 16:34:40 +01:00
Arturo Gonzalez bc077c8a7d Added disable agents in policy when js is crazy 2017-09-21 12:22:55 +02:00
Daniel Maya a8cae99747 Updated id module group 2017-05-24 16:17:43 +02:00
daniel fb4cc26193 fixed minor errors and no show warnning in console to create agent groups 2017-02-14 15:47:12 +01:00
Arturo Gonzalez d51225f86c Added pass field to groups in console. Ticket #153 2017-01-16 11:34:55 +01:00
m-lopez-f 7ca577ce51 Reorganizate code for use OS/module groups in metaconsole. Tiquet #3490 2016-06-06 13:05:25 +02:00
m-lopez-f a837e110d0 Fixed bulk deleted action alerts. Tiquet: #3268
(cherry picked from commit aac2460c85)
2016-01-28 09:46:06 +01:00
Arturo Gonzalez 54e0f25947 Fixed "agents with templates" box in bulk alert actions add. Ticket#3087 2015-12-23 16:20:58 +01:00
m-lopez-f ae9abbeed7 Add warning when was creating group and console is part of a metaconsole. Tiquet: #2790 2015-09-29 10:14:30 +02:00
m-lopez-f d516fcefa6 Fixed problems of header response of ajax. Tiquet: #2630 2015-09-10 12:00:33 +02:00
m-lopez-f 0e60723b87 Fixed url for redirecting in metaconsole 2015-08-27 15:04:08 +02:00
m-lopez-f d7bd4773db Change visual of metaconsole 2015-07-02 08:54:21 +02:00
m-lopez-f 58ea3ebb6b Change visual 2015-06-26 08:49:51 +02:00
m-lopez-f 94c742bfbe Merge from Develop 2015-06-25 10:40:35 +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 9544dec1ac Change visual of console 2015-06-15 15:50:28 +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
m-lopez-f 589f054928 Fixed error when selected in bulk actions agents edit any status, show all agents. Tiquet: #2261 2015-06-01 13:41:31 +02:00
Vanessa Gil 4392958648 Ticket #2044. 2015-04-13 16:58:05 +02:00
m-lopez-f 58722a5891 Changed visual of metaconsole 2015-03-06 12:28:05 +01:00
mdtrooper 72257865b5 Fixed the group count for to show delete icon in the list 2014-09-16 15:35:28 +02:00
vgilc dc3124a332 2014-08-27 Vanessa Gil <vanessa.gil@artica.es>
* godmode/groups/group_list.php: Fixed problem displaying empty 
	agents.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10462 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-27 06:42:49 +00:00
vgilc f363dd19fc 2014-08-25 Vanessa Gil <vanessa.gil@artica.es>
* godmode/groups/group_list.php: Fixed bug listing
	group hierarchy.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10453 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-25 09:05:48 +00:00
vgilc 5d4b94466e 2014-08-25 Vanessa Gil <vanessa.gil@artica.es>
* godmode/groups/configure_group.php
	  include/functions_tags.php
	  operation/events/events.build_query.php
	  operation/events/events.build_table.php: Fixed ACL propagation + Tags. 
	Tickets #1079 and #1072.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10452 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-25 09:02:45 +00:00
hkosaka af80ec25aa 2014-05-30 Hirofumi Kosaka <kosaka@rworks.jp>
* include/javascript/jquery.pandora.controls.js,
	godmode/groups/group_list.php,
	godmode/massive/massive_add_alerts.php,
	godmode/massive/massive_add_action_alerts.php
	godmode/massive/massive_delete_action_alerts.php,
	godmode/massive/massive_delete_alerts.php,
	godmode/massive/massive_enable_disable_alerts.php,
	godmode/massive/massive_standby_alerts.php: fixed bug that all
	agents would be shown in the target for masssive operations, if
	the user has an AW privilege for any agent (group).



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10048 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-05-30 11:01:22 +00:00
juanmanuelr cb92d75167 2014-05-22 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/groups/group_list.php: Dont show void agents
        in report template wizard.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9986 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-05-22 13:22:27 +00:00
mdtrooper b1d644e772 2014-03-24 Miguel de Dios <miguel.dedios@artica.es>
* godmode/massive/massive_edit_modules.php,
	godmode/massive/massive_edit_agents.php,
	godmode/massive/massive_delete_modules.php,
	godmode/massive/massive_copy_modules.php,
	godmode/groups/group_list.php, operation/agentes/ver_agente.php:
	implement the filter by agent status in the other massive
	operations.
	
	Incident: #669




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9644 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-03-25 12:39:26 +00:00
mdtrooper 7e4a2ba7a9 2014-03-24 Miguel de Dios <miguel.dedios@artica.es>
* godmode/massive/massive_edit_agents.php,
	godmode/massive/massive_delete_agents.php,
	godmode/groups/group_list.php, include/functions_agents.php,
	include/javascript/jquery.pandora.controls.js,
	operation/agentes/ver_agente.php,
	operation/agentes/estado_monitores.php: added the feature to filter
	by agent status in the massive operations into
	"massive agent deletion" and "massive agent edition".
	
	Incident: #669




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9639 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-03-24 11:41:54 +00:00
vgilc 35a7782fbe 2014-03-13 Vanessa Gil <vanessa.gil@artica.es>
* godmode/menu.php
	  godmode/groups/configure_modu_group.php
	  godmode/groups/modu_group_list.php: Moved 'Module groups'
	to 'Manage modules'.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9574 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-03-13 07:32:10 +00:00
mdtrooper 35ae895c48 2013-11-20 Miguel de Dios <miguel.dedios@artica.es>
* godmode/groups/configure_group.php, godmode/groups/group_list.php:
	fixed the show and edit groups with the ACL of the user has not
	access to the parent.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9105 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-11-20 13:14:12 +00:00
zarzuelo 5c793dfccb 2013-10-10 Sergio Martin <sergio.martin@artica.es>
* include/styles/pandora.css
	godmode/groups/configure_group.php
	godmode/alerts/alert_templates.php
	godmode/modules/manage_network_components.php
	godmode/tag/tag.php
	godmode/tag/edit_tag.php
	godmode/category/edit_category.php: Fixed many aesthetic
	issues



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8882 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-10 09:20:21 +00:00
zarzuelo 090b2e7fb3 2013-10-08 Sergio Martin <sergio.martin@artica.es>
* include/functions_alerts.php
	include/javascript/jquery.pandora.controls.js
	include/functions_treeview.php
	operation/tree.php
	operation/agentes/ver_agente.php
	godmode/groups/group_list.php
	godmode/massive/massive_add_alerts.php
	godmode/massive/massive_delete_modules.php
	godmode/massive/massive_delete_alerts.php
	godmode/massive/massive_edit_modules.php
	godmode/reporting/graph_builder.graph_editor.php: Add sorting
	in many agents list retrieved by ajax and tree view



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8868 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-08 09:48:26 +00:00
zarzuelo d7510afef9 2013-09-19 Sergio Martin <sergio.martin@artica.es>
* include/functions_groups.php
	godmode/groups/group_list.php: Fix groups view pagination
	and other internal fail retrieving the groups in tree way



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8782 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-09-19 10:35:12 +00:00