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

251 Commits

Author SHA1 Message Date
fbsanchez a5bf72cca0 Merge remote-tracking branch 'origin/develop' into ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card 
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/include/constants.php
	pandora_server/lib/PandoraFMS/Tools.pm
 2021-10-26 14:21:40 +02:00
marcos 795d5c055a merge conflict 2021-10-07 09:56:17 +02:00
alejandro.campos@artica.es ec693a88a0 fixed count 2021-10-05 11:26:29 +02:00
Daniel Rodriguez 8e737502c5 Merge branch 'ent-7133-texto-ingles-discovery' into 'develop' 
Fixed text

Closes pandora_enterprise#7133

See merge request artica/pandorafms!3976
 2021-05-06 12:10:21 +00:00
Daniel Rodriguez fff13ad2ac Merge branch 'ent-6377-proyectos-amazon-s3-en-el-discovery' into 'develop' 
Minor changes

See merge request artica/pandorafms!3930
 2021-04-13 14:31:37 +00:00
Luis 4ab7b1a135 Ent 6952 bug group creation user admin no all 2021-04-07 08:11:35 +00:00
Daniel Rodriguez 1e90b0d300 Merge branch 'ent-6986-11304-ordenar-alfabeticamente-los-resultados-snmp-en-discovery' into 'develop' 
Modules alphabetically sorted in Discovery review

See merge request artica/pandorafms!3907
 2021-04-06 17:09:28 +00:00
Daniel Rodriguez c192a1681b Merge branch 'ent-7022-open-error-en-la-ruta-de-netscan-custom' into 'develop' 
Fixed task edit url when nof fully defined (custom-script)

See merge request artica/pandorafms!3906
 2021-04-06 17:00:49 +00:00
fbsanchez 98b7a9c66a Update DiscoveryTaskList.class.php 2021-04-05 14:05:53 +00:00
Jose Gonzalez 293cbc2e44 Fixed text 2021-03-29 12:17:41 +02:00
marcos 1f89a0d293 fixed visual error 2021-03-29 09:58:23 +02:00
marcos 823bf52372 fixed visual error 2021-03-25 11:49:32 +01:00
fbsanchez 9c693e309c AWS.S3 monitoring RC1 2021-03-24 11:52:47 +01:00
fbsanchez 659c1b4503 Wizard Aws.S3 RC1 2021-03-22 19:21:05 +01:00
Daniel Rodriguez 9c4a6a56c7 Merge branch 'ent-5331-implementar-monitorizacion-de-ms-SQL-Server-en-discovery-como-el-de-oracle' into 'develop' 
add discovery_app_microsoft_sql_serve on task list

See merge request artica/pandorafms!3058
 2021-03-18 09:56:31 +00:00
fbsanchez 61cb8a43c6 Merge remote-tracking branch 'origin/develop' into ent-6894-uniway-estado-pending-en-server-task-aws 
Conflicts:
	pandora_console/godmode/wizards/DiscoveryTaskList.class.php
 2021-03-17 13:25:38 +01:00
fbsanchez 71a0dcfd0c Merge remote-tracking branch 'origin/develop' into ent-5331-implementar-monitorizacion-de-ms-SQL-Server-en-discovery-como-el-de-oracle 
Conflicts:
	pandora_console/include/constants.php
	pandora_server/lib/PandoraFMS/Recon/Base.pm
 2021-03-17 10:11:58 +01:00
fbsanchez 02b2eec65d Modules alphabetically sorted in Discovery review 2021-03-15 15:16:49 +01:00
fbsanchez c20c206a5f Fixed task edit url when nof fully defined (custom-script) 2021-03-15 14:37:08 +01:00
Marcos Alconada d8a628b1c4 Ent 6781 revision de estilos visuales y eliminacion de sistemas skins 2021-03-11 14:40:23 +00:00
Daniel Rodriguez 96d5555ed2 Merge branch 'ent-6464-Discovery-id_recon_server-no-cambia-si-no-existe' into 'develop' 
Ent 6464 discovery id recon server no cambia si no existe

Closes pandora_enterprise#6464

See merge request artica/pandorafms!3788
 2021-03-10 15:53:28 +00:00
Daniel Rodriguez b9f72a1ef9 Merge branch 'ent-6892-Discover-Task-List-no-hay-limitación-por-grupo' into 'develop' 
Ent 6892 discover task list no hay limitación por grupo

See merge request artica/pandorafms!3756
 2021-03-05 12:56:01 +00:00
fbsanchez daa95d40c8 Merge remote-tracking branch 'origin/develop' into ent-6894-uniway-estado-pending-en-server-task-aws 
Conflicts:
	pandora_console/godmode/wizards/DiscoveryTaskList.class.php
 2021-03-04 14:32:01 +01:00
Daniel Rodriguez 6c2a353812 Merge branch 'ent-6839-Crear-llamadas-a-la-api-para-activar-o-parar-una-discovery-task' into 'develop' 
Ent 6839 crear llamadas a la api para activar o parar una discovery task

See merge request artica/pandorafms!3798
 2021-03-04 10:47:20 +00:00
fbsanchez b17d6349f7 Multiple fixes port defition 2021-02-09 13:44:21 +01:00
Jose Gonzalez d5b99f255a Solved issue 2021-01-26 13:46:12 +01:00
Daniel Maya 312a08219c Added disable/enable for discovery task 2021-01-25 13:56:04 +01:00
Jose Gonzalez 38ea74ed11 Updated merge 2021-01-25 13:36:12 +01:00
Jose Gonzalez 91b74fe19f Fixed little issue with the URL 2021-01-20 17:55:11 +01:00
Daniel Rodriguez ea86889673 Merge branch 'ent-6645-bug-acl-discovery-tasks' into 'develop' 
Fixed acl on discovery tasklist

See merge request artica/pandorafms!3618
 2021-01-14 14:43:42 +01:00
daniel a470658543 remove IPAM to extension 2021-01-14 14:42:18 +01:00
Daniel Rodriguez ed50126b1b Merge branch 'ent-3661-poder-elegir-dataserver-en-vmware-a-traves-de-discovery' into 'develop' 
Ent 3661 poder elegir dataserver en vmware a traves de discovery

See merge request artica/pandorafms!3683
 2021-01-11 15:43:18 +01:00
fbsanchez 8f2109003b avoid review for non H&D tasks 2021-01-08 10:31:38 +01:00
fbsanchez 7aedc39f69 Task list status 2021-01-07 13:48:57 +01:00
fbsanchez 186b807ff7 Merge remote-tracking branch 'origin/develop' into ent-3661-poder-elegir-dataserver-en-vmware-a-traves-de-discovery 
Conflicts:
	pandora_console/include/styles/wizard.css
 2021-01-07 10:50:57 +01:00
Daniel Maya 2781b4ab34 Fixed task list groups 2021-01-05 11:42:34 +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 Rodriguez 4b51e26086 Merge branch 'ent-4231-crear-plugin-para-google-cloud-y-anadirlo-a-discovery' into 'develop' 
discovery.cloud.gcp

See merge request artica/pandorafms!3479
 2020-12-09 13:54:25 +01:00
fbsanchez b4bb0a1dcf warn while no instances are shown in map quick preview (discovery GCP) 2020-12-09 12:23:49 +01:00
fbsanchez d45a72f355 minor fix PM -> UM for cred access (managemnt) 2020-12-04 13:32:42 +01:00
Daniel Maya 296cb9125e Ent 5316 anadir seccion credential store al menu de discovery 2020-12-03 14:48:12 +01:00
fbsanchez eb67b387b9 Merge remote-tracking branch 'origin/develop' into ent-4231-crear-plugin-para-google-cloud-y-anadirlo-a-discovery 
Conflicts:
	pandora_console/include/class/CredentialStore.class.php
 2020-12-01 17:32:02 +01:00
fbsanchez 54d5529599 removed duplicated methods (unified in HTML class) added minor improvements 2020-11-30 17:50:36 +01:00
Jose Gonzalez 649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
Daniel Rodriguez d08e60f13a Merge branch 'ent-6741-Vulnerabilidad-SQL-injection' into 'develop' 
Fix vulnerability

Closes pandora_enterprise#6741

See merge request artica/pandorafms!3622
 2020-11-26 18:07:20 +01:00
Jose Gonzalez 8c26892e55 Allow add text 2020-11-26 16:58:02 +01:00
Daniel Rodriguez 36d63a4869 Merge branch 'ent-6436-la-columna-nombre-es-muy-pequena-discovery-task-list' into 'develop' 
Minor fixes discovery tasklist usability

See merge request artica/pandorafms!3506
 2020-11-23 10:44:27 +01:00
Jose Gonzalez e0404d565a Fix vulnerability 2020-11-17 14:49:26 +01:00
Luis Calvo 2ee187ae53 Fixed acl on discovery tasklist 2020-11-16 18:30:23 +01:00
Jose Gonzalez 8baf5df61a Fix visual issue 2020-11-13 14:09:22 +01:00