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

1350 Commits

Author SHA1 Message Date
daniel 133eef456a Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-14 08:14:34 +02:00
Daniel Cebrian 5d5c956a5b #11849 translates and upload mr 2023-08-11 12:12:48 +02:00
Daniel Cebrian 24b346ddd6 #11326 fixed tentacle_client and changed security module name 2023-08-11 10:14:35 +02:00
Daniel Cebrian 843dbef258 #11326 added security module in inventary windows 2023-08-10 14:18:01 +02:00
Jorge Rincon 236ad09ad6 #11843 Added MR and pandorabd_data 2023-08-10 14:08:31 +02:00
Daniel Cebrian 8da33cd0ca #11326 codify tsca data 2023-08-10 13:25:55 +02:00
Daniel Cebrian c21b16bd45 #11326 added security module in inventary 2023-08-10 12:26:24 +02:00
Daniel Cebrian 2e983b3ef0 #11326 added tsca table in mr and scheme database 2023-08-09 15:01:14 +02:00
daniel 1bf7f1e36e ITSM pandora_enterprise#11471 2023-07-21 14:23:42 +02:00
Alejandro Sánchez 73ee9807d0 Merge branch 'develop' into 'ent-9735-integrar-plugin-de-inventario-de-solaris-en-agente-unix' 
# Conflicts:
#   pandora_console/extras/mr/65.sql
 2023-07-10 09:43:28 +00:00
alejandro e744e60da3 Merge remote-tracking branch 'origin/develop' into ent-9735-integrar-plugin-de-inventario-de-solaris-en-agente-unix 2023-06-29 16:24:04 +02:00
alejandro 51b67aa46c added inventory solarix modules in pandoradb_data.sql 2023-06-29 16:16:55 +02:00
Félix Suárez 4ac36b7754 Replace "[á,a]rtica PFMS" 2023-06-23 15:59:49 -06:00
Jorge Rincon 89355f07a4 #11595 The title and the url of the Tip are updated in the English language. 2023-06-16 12:03:44 +02:00
daniel 674c49fc91 mr and translates pandora_enterprise#11457 2023-06-07 08:12:14 +02:00
Jonathan 01ec39bde0 Merge branch 'develop' into ent-11001-15457-tips-solo-en-espanol 2023-05-30 13:19:23 +02:00
Daniel Rodriguez 018f024815 Merge branch 'ent-11109-cambiar-estado-de-seleccion-por-defecto-de-power-supply-en-snmp-wizard' into 'develop' 
Draft: Ent 11109 cambiar estado de seleccion por defecto de power supply en snmp wizard

See merge request artica/pandorafms!5846
 2023-05-16 10:32:20 +00:00
daniel 32bc57e767 update files translate and current package pandora_enterprise#11151 2023-05-09 14:05:48 +02:00
Jorge Rincon b8611573f2 #11109 Default value of the module_enabled field to 1 from the tnetwork_component table 2023-05-08 10:55:13 +02:00
Jonathan dfffed1912 #11001 fix sql error MR 2023-04-25 10:07:27 +02:00
Jonathan cde914fb69 #11001 welcome tips english version 2023-04-25 09:10:34 +02:00
slerena e0a83e5340 Updated default colors (again). This is the final one I hope. 2023-03-31 09:23:13 +00:00
slerena 3d84aea29e Updated color4 2023-03-30 18:11:03 +00:00
slerena 5e273ad4d5 Updated default colors to reflect pandorafms official color palette (2023) 2023-03-30 18:05:05 +00:00
daniel 72e35de00e fixed styles 2023-03-30 16:49:17 +02:00
Daniel Cebrian a60f9be920 #9624 changed default binary path daemon for sflow 2023-03-23 09:53:34 +01:00
Daniel Cebrian 9dea38f440 Merge branch 'develop' into ent-9624-meter-soporte-a-sflow-en-nuestro-gestor-de-flujos 2023-03-21 09:38:56 +01:00
Daniel Cebrian daae94f904 #9624 deleted General network path from database 2023-03-13 09:49:44 +01:00
Daniel Cebrian ca78f069f6 #9624 added support sflow 2023-03-10 17:12:38 +01:00
Daniel Cebrian abf8792ec9 #9073 fixed error error for multiple io_safe_input 2023-03-08 09:13:04 +01:00
Daniel Cebrian a4634717d8 Merge branch 'develop' into ent-9073-nuevo-sistema-de-tips-de-bienvenida 2023-03-07 13:49:39 +01:00
Daniel Cebrian 135793454c #9073 added images 2023-03-06 12:20:08 +01:00
daniel f6e063b981 Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones 
Conflicts:
	pandora_console/include/class/SnmpConsole.class.php
 2023-03-06 08:09:29 +01:00
slerena 970c8e4830 Updated "DB First installed", this field was intented to be used on changes of major versions, not used anymore, but doesn't have amy sense to keepit in 6.x 2023-03-03 10:14:43 +00:00
slerena 88ce83b9ac Updated some dates and notices. Updated database schema version / build (build should be modified in each release) 2023-03-03 10:12:31 +00:00
slerena 62ae32335d Updated default values in config for heigh in report graphs (to 250px), and days delete for non-init agents (set to 7, was 0). 2023-03-03 10:08:34 +00:00
daniel a758528968 Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones 
Conflicts:
	pandora_console/extras/mr/62.sql
	pandora_console/include/class/AuditLog.class.php
 2023-03-01 07:56:32 +01:00
Matias Didier cccae56b8a Merge branch 'ent-9517-buscar-por-campos-avanzados-de-agente' into 'develop' 
Ent 9517 buscar por campos avanzados de agente

See merge request artica/pandorafms!5446
 2023-02-28 11:59:01 +00:00
daniel 8230ae616b Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones 
Conflicts:
	pandora_console/godmode/users/user_list.php
	pandora_console/operation/events/events.php
 2023-02-22 12:35:34 +01:00
Jose Gonzalez da58e4b9e0 Ticket 10484 Fixed List Operating Systems 2023-02-20 13:02:24 +01:00
Daniel Cebrian 1d0046b3c1 #10459 activate Apply password policy to admin users default by default 2023-02-20 10:07:10 +01:00
Daniel Cebrian 8a4fe45891 #9073 added tables in schema sql installation 2023-02-20 08:59:11 +01:00
Daniel Maya 18ac39f2c4 #10432 translation updates 2023-02-15 15:05:17 +01:00
Jose Gonzalez 54f287f754 Added missed icons in DB 2023-02-10 14:54:50 +01:00
Jose Gonzalez 0363a90e1f Resolve merge issues 2023-01-31 17:35:44 +01:00
Jonathan 1e7cbb5521 #9517 Custom sql - Agent safe mode not enable 2023-01-24 10:18:01 +01:00
Jonathan b64c1ee44c #9517 Custom sql - Agent safe mode not enable 2023-01-23 16:19:54 +01:00
Calvo 54e9559f3b Deleted sample visual consoles 2023-01-16 11:07:56 +01:00
Jose Gonzalez a9c4dd625c Merge develop branch 2023-01-11 13:46:15 +01:00
Jose Gonzalez 8421fb49ca Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones 2023-01-04 15:54:16 +01:00
Calvo 6d9149e11b Merge remote-tracking branch 'origin/develop' into ent-7386-Ocultar-credenciales-de-acceso-a-la-API 2022-12-29 17:39:12 +01:00
daniel 69e3203317 Merge remote-tracking branch 'origin/develop' into ent-9554-nuevas-graficas-de-tarta-que-reemplazar-a-las-actuales-3 2022-12-27 09:06:20 +01:00
daniel 47c503bdab Merge remote-tracking branch 'origin/develop' into ent-9554-nuevas-graficas-de-tarta-que-reemplazar-a-las-actuales-3 2022-12-21 12:51:18 +01:00
alejandro.campos@artica.es 5520daead9 Merge branch 'ent-8297-Mejoras-en-gestion-de-acceso-a-pandora-MD5-SHA256-y-Salt-opcional' of brutus.artica.es:artica/pandorafms into ent-8297-Mejoras-en-gestion-de-acceso-a-pandora-MD5-SHA256-y-Salt-opcional 2022-12-20 13:41:44 +01:00
alejandro.campos@artica.es 90e5205b16 changed admin pass encryption 2022-12-20 13:41:25 +01:00
Daniel Barbero 2e48d51714 change version 768-MR60 pandora_enterprise#9554 2022-12-20 12:32:41 +01:00
Calvo f84f9733e3 Merge remote-tracking branch 'origin/develop' into ent-7386-Ocultar-credenciales-de-acceso-a-la-API 2022-12-20 12:15:10 +01:00
alejandro c6637d59e4 added also the updates in the mr and updated the inserts in pandoradb_data.sql for the motherboards, monitors, printers, product_key, product_id inventory plugins. 2022-12-16 12:19:30 +01:00
alejandro 5c41b88ed2 added updates to mr with new code to update the scripts and changed the code of the windows tmodule_inventory inserts in pandoradb_data.sql 2022-12-16 09:00:01 +01:00
jose.gonzalez@pandorafms.com d43ae677a3 Changed icons and minor fixes 2022-12-15 12:41:38 +01:00
Rafael Ameijeiras f9bb893aae Merge branch 'ent-8849-13468-Anadir-links-web-en-los-custom-fileds-de-agente' into 'develop' 
implemented custom field

See merge request artica/pandorafms!5271
 2022-12-12 08:20:08 +00:00
Rafael Ameijeiras 1b3535da58 Merge branch 'ent-9709-crear-el-usuario-admin-como-local-por-defecto' into 'develop' 
Ent 9709 crear el usuario admin como local por defecto

See merge request artica/pandorafms!5256
 2022-12-12 08:12:42 +00:00
jose.gonzalez@pandorafms.com 445a8161cf Merge 2022-12-05 09:44:35 +01:00
jose.gonzalez@pandorafms.com dccd950e9e Changes 2022-11-30 10:14:42 +01:00
Daniel Maya 306d0f0cf2 #9927 changed lts_name 2022-11-28 09:24:50 +01:00
alejandro.campos@artica.es 767624b0c3 implemented link type custom field 2022-11-22 11:50:07 +01:00
alejandro.campos@artica.es 5e510e7e12 implemented custom field 2022-11-16 10:28:50 +01:00
alejandro.campos@artica.es e7bf53ee40 minor fix 2022-11-10 18:15:41 +01:00
edu.corral 5e224bb825 ent 9709 admin as local user 2022-11-08 11:38:45 +01:00
Daniel Rodriguez 4f99d94dc0 Merge branch 'ent-9714-traducciones' into 'develop' 
translates pandora_enterprise#9714

See merge request artica/pandorafms!5228
 2022-11-07 13:27:51 +00:00
Daniel Barbero 39df7fe13a Merge remote-tracking branch 'origin/develop' into ent-9714-traducciones 
Conflicts:
	pandora_console/include/visual-console-client/maintenanceMode.png
	visual_console_client/src/lib/maintenanceMode.png
 2022-11-04 11:14:20 +01:00
edu.corral 6a9e30ae6d ent 7914 status scaling 2022-11-02 12:53:14 +01:00
Daniel Barbero 10750e2464 translates pandora_enterprise#9714 2022-10-28 08:35:21 +02:00
edu.corral 47521e7e3c ent 7914 database adjustements 2022-10-26 09:07:48 +02:00
edu.corral 4ed96e4a6e ent 7914 warning scaling 2022-10-21 13:53:25 +02:00
Daniel Barbero 3099ffa7cb add mode maintenance VC pandora_enterprise#4822 2022-10-13 13:44:39 +02:00
Daniel Maya c1b4501da5 resolved conflict 2022-10-03 14:41:14 +02:00
Daniel Barbero 81ed331688 translates pandora_enterprise#9572 2022-09-29 15:19:11 +02:00
Alejandro Campos b11839dde5 Merge branch 'develop' into 'ent-9395-14081-Politicas-no-aplican-a-grupos-secundarios' 
# Conflicts:
#   pandora_console/extras/mr/57.sql
 2022-09-27 15:24:28 +00:00
alejandro.campos@artica.es 3bf2dd1b5c make policy group application optional 2022-09-23 09:50:38 +02:00
alejandro.campos@artica.es d1cc2458b6 implemented alert commands and actions to send report by email 2022-09-13 12:16:53 +02:00
Daniel Maya d53ee55663 #9331 Fixed wizard wmi 2022-09-08 15:18:48 +02:00
José González b07a161fb0 Added control for clean not initialized modules 2022-08-29 14:05:30 +02:00
Daniel Barbero Martin 12f73d86fd new filter search eventspandora_enterprise#8942 2022-07-05 17:02:40 +02:00
José González b175ffbd3a Fixed db change 2022-06-28 17:22:09 +02:00
vanessa gil 653226d45b Clean version. 2022-06-23 19:54:26 +02:00
Daniel Barbero Martin bf28b44339 mr 2022-06-23 14:35:38 +02:00
Daniel Rodriguez 416021bca6 Merge branch 'ent-8822-enlace-web-en-metaconsola-para-nuevas-sugerencias' into 'develop' 
Changed link to Suggest new feature on new installation

See merge request artica/pandorafms!4874
 2022-06-06 08:45:20 +00:00
Daniel Maya 0d3b14da40 #9005 Added lts_name 2022-05-23 13:00:01 +02:00
Calvo 752a716c21 Changed link to Suggest new feature on new installation 2022-05-09 08:58:14 +02:00
Luis 4b743d64c9 Change event list fields order on new install 2022-04-27 11:20:37 +02:00
alejandro.campos@artica.es 69e0bf2697 fixed error during merge process 2022-04-20 15:58:26 +02:00
alejandro.campos@artica.es 7ec1784429 Merge remote-tracking branch 'origin/develop' into ent-8817-Falla-proceso-de-merge-en-metaconsola 2022-04-20 15:53:20 +02:00
Daniel Rodriguez f36a89d41d Merge branch 'ent-8557-Disenar-nuevas-plantillas-de-alertas-de-correo-para-Pandora' into 'develop' 
change email alert templates

See merge request artica/pandorafms!4808
 2022-04-18 11:51:42 +00:00
alejandro.campos@artica.es 903e2ae34c minor fix 2022-04-12 11:24:31 +02:00
alejandro.campos@artica.es 0721169da5 minor fix in templates 2022-04-11 18:27:20 +02:00
alejandro.campos@artica.es 6b708777f6 change email alert templates 2022-04-07 17:24:06 +02:00
Daniel Barbero Martin 9de7f0564e update version 2022-04-06 09:42:09 +02:00
fbsanchez f48a7af04f Missing network components 2022-03-14 11:25:33 +01:00
fbsanchez 8d049a0ad5 removed invalid components from pandoradb_data 2022-03-03 18:26:28 +01:00
fbsanchez 6bb754d5d2 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 
Conflicts:
	pandora_console/pandoradb.sql
 2022-02-08 13:02:22 +01:00
Daniel Barbero Martin b91109d747 Merge remote-tracking branch 'origin/develop' into ent-3943-Plantillas-de-alerta-con-varios-horarios 2022-02-02 08:06:05 +01:00
fbsanchez 592df1c3a7 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 
Conflicts:
	pandora_console/pandoradb.sql
 2022-02-01 15:16:21 +01:00
fbsanchez ead8b39146 some updates 2022-02-01 15:11:59 +01:00
alejandro.campos@artica.es 74c2dafed0 added token to display or hide command in event response execution 2022-02-01 14:30:25 +01:00
Daniel Barbero Martin a7da2faa32 alert template schedule pandora_enterprise#3943 2022-02-01 13:16:11 +01:00
Daniel Barbero Martin c02abbc508 alert template schedule pandora_enterprise#3943 2022-01-31 13:45:44 +01:00
Daniel Barbero Martin 3f9b5f0a8a fix mr and current package 2022-01-21 11:56:38 +01:00
fbsanchez 3e7a81ea33 Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 
Conflicts:
	pandora_console/extras/mr/51.sql
 2021-12-03 10:24:01 +01:00
fbsanchez 9c17625c77 ncm2 2021-11-26 18:11:34 +01:00
Calvo 5464a73a12 Merge remote-tracking branch 'origin/develop' into ent-8303-formularios-en-modulos-para-nueva-funcionalidad-incremento-de-valor 2021-11-24 13:28:36 +01:00
Calvo 33a24533e1 Added new token percentage_warning and percentage_critical to pandoradb_data on tpolicy_modules 2021-11-24 13:27:33 +01:00
fbsanchez 582cb9a082 Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 
Conflicts:
	pandora_console/extras/mr/51.sql
 2021-11-19 10:51:46 +01:00
fbsanchez ee09470962 wip ncm2 2021-11-12 16:55:35 +01:00
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
Daniel Barbero Martin e8c6342af4 Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales 2021-11-04 08:15:01 +01:00
vgilc 89e1f4ed92 Merge branch 'ent-8218-Actualizar-cadenas-español' into 'develop' 
Ent 8218 actualizar cadenas español

See merge request artica/pandorafms!4518
 2021-11-03 13:04:12 +00:00
Daniel Barbero Martin 53361484fd Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales 2021-11-03 11:16:46 +01:00
Daniel Barbero Martin c73ee2d113 updated mr and version 2021-11-03 11:04:19 +01:00
Daniel Maya 3ccd97f50f #8218 deleted mo and po 2021-11-03 09:18:58 +01:00
Daniel Barbero Martin 25268ec9b4 color 2021-11-02 17:49:45 +01:00
fbsanchez df863c6057 minor fix NCM test script 2021-10-21 12:20:12 +02:00
fbsanchez 303d6632e1 NCM 2021-10-21 11:28:14 +02:00
fbsanchez bb8dbc9332 NCM 2021-10-21 02:17:17 +02:00
Jose Gonzalez a70d48514e Fix Barivion name in license and readme 2021-10-06 13:33:25 +02:00
Jose Gonzalez b963e4b9df Fixed some things 2021-10-04 10:09:01 +02:00
Jose Gonzalez 8696d21a42 Fixed any minor bugs 2021-09-29 17:03:13 +02:00
Jose Gonzalez 1a884a9df6 Merge remote-tracking branch 'origin' into ent-7662-rebranding-meta 2021-09-28 11:33:48 +02:00
Calvo c1332a1064 updated MR and current_package token 2021-09-14 12:20:53 +02:00
Calvo b039935470 Update Mr to 49 2021-09-13 10:45:22 +02:00
Jose Gonzalez 423bd106d5 Fix issues 2021-09-01 16:57:48 +02:00
Calvo d5910e8a3a Merge remote-tracking branch 'origin/develop' into ent-7587-error-nombre-idioma-aleman 2021-09-01 09:14:39 +02:00
José González 215c0e3cc1 Branding 2021-08-30 16:24:51 +02:00
Daniel Rodriguez 7673e40613 Merge branch 'ent-7737-Pandora-recien-instalado-mensaje-de-advertencia-de-fuente-por-defecto-no-definida' into 'develop' 
fixed font reference

See merge request artica/pandorafms!4238
 2021-08-11 07:12:13 +00:00
Calvo 3880cf09ea Fix german language misspell 2021-07-14 18:48:41 +02:00
fbsanchez 9b31906bdf Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/mr/48.sql
 2021-07-13 10:01:59 +02:00
Daniel Maya a4203aaee2 Ent 7272 nuevos elementos consola visual odómetro 2021-07-12 10:27:10 +00:00
fbsanchez 074fbf916c Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-29 20:03:07 +02:00
Daniel Maya b37bbcd944 Ent 7143 autoajuste de la consola visual 2021-06-29 10:02:13 +00:00
alejandro.campos@artica.es 7fa398b027 fixed font reference 2021-06-28 11:25:22 +02:00
fbsanchez 4c2ac234b8 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/mr/48.sql
	pandora_console/godmode/servers/plugin.php
 2021-06-24 14:37:30 +02:00
Luis 497ecb329d Changed new wiki url on helps 2021-06-24 12:31:15 +00:00
Daniel Barbero Martin 841842da59 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/pandoradb_data.sql
 2021-06-16 08:46:21 +02:00
fbsanchez 14495ebdc3 Current package updates 2021-06-15 11:06:46 +02:00
Daniel Barbero Martin a7c1c49636 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-14 08:42:31 +02:00
marcos 50282dccf4 add new link documentation 2021-06-09 16:55:25 +02:00
Daniel Barbero Martin a0982cd260 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/godmode/users/profile_list.php
 2021-05-18 08:39:06 +02:00
fbsanchez 818186ff28 DB updates - syncqueue 2021-05-17 12:57:15 +02:00
alejandro.campos@artica.es 1a194e1644 minor change 2021-05-13 14:10:42 +02:00