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

1240 Commits

Author SHA1 Message Date
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
alejandro.campos@artica.es b52f971262 minor change 2021-05-13 14:06:54 +02:00
vanessa gil 97e7e8c8cb Updated version. 2021-04-30 13:57:00 +02:00
vanessa gil f51ad33554 Updated version. 2021-04-30 10:34:20 +02:00
Daniel Maya 9bbac06771 Ent 7161 cambiar opciones de skin en usuarios y grupos 2021-04-13 09:26:50 +00:00
fbsanchez 1ac6ed35cf Merge remote-tracking branch 'origin/develop' into ent-6924-cambiar-label-event-text-por-event-name 
Conflicts:
	pandora_console/extras/mr/46.sql
 2021-04-07 10:23:33 +02:00
vgilc 142b271ba0 Update pandoradb_data.sql 2021-03-29 12:21:12 +00:00
fbsanchez c5b2b90476 Merge remote-tracking branch 'origin/develop' into ent-6232-nt-incluir-ifspeed-como-custom-macro-en-ifoperstatus 
Conflicts:
	pandora_console/extras/mr/45.sql
 2021-03-02 09:48:33 +01:00
Daniel Barbero Martin 234097320f fixed mr version and remove updates mr 2021-02-17 13:04:59 +01:00
fbsanchez 416bc8cad4 Minor fixes 
and speed out of control
 2021-02-16 12:33:15 +01:00
fbsanchez 74ee4971d0 Added inUsage and outUsage, added units 2021-02-16 12:14:56 +01:00
fbsanchez 2826f4fd89 Fixes in MR, added uniqid macro to pandora_snmp_bandwidth 2021-02-15 19:08:32 +01:00
fbsanchez 09b5400023 MR info + bandwidth analysis in wizards 2021-02-15 18:56:42 +01:00
alejandro-campos 9c924db8dc Merge branch 'develop' into ent-6855-Casca-netscan-custom-en-la-open 2021-01-18 10:29:06 +01:00
daniel a470658543 remove IPAM to extension 2021-01-14 14:42:18 +01:00
fbsanchez 3f61d97e0f Event text to Event name in alert_actions Monitoring event 2021-01-12 13:39:03 +01:00
Daniel Rodriguez 7bbecceacc Merge branch 'ent-6779-Cambio-label-en-campo-de-alertas-SNMP' into 'develop' 
Ent 6779 cambio label en campo de alertas snmp

See merge request artica/pandorafms!3661
 2021-01-11 14:58:14 +01:00
Daniel Rodriguez 5658b52e3f Merge branch 'ent-6498-Alertas-siempre-marcan-modulos-como-critical-en-los-correos-con-el-mail-to-admin-por-defecto' into 'develop' 
changed mail to admin default action

See merge request artica/pandorafms!3656
 2021-01-04 11:10:19 +01:00
Daniel Maya f2b673b62b merge conflict resolved 2021-01-04 09:16:14 +01:00
José González 02475d25b6 Merge branch 'develop' into 'ent-1175-copyright-actualizados' 
# Conflicts:
#   pandora_console/general/header.php
#   pandora_console/general/sap_view.php
 2020-12-23 06:48:22 +01:00
alejandro-campos f03b4e59f8 several fixes in netscan custom 2020-12-18 11:40:22 +01:00
Daniel Rodriguez 7a67412398 Merge branch 'ent-6698-Demos-de-consolas-visuales-sin-el-token-Legacy-Visual-Console-aparecen-vacias' into 'develop' 
fix inserts demo VC

See merge request artica/pandorafms!3638
 2020-12-17 17:02:42 +01:00
vanessa gil 5763948625 Updated version. 2020-12-14 13:52:54 +01:00
Jose Gonzalez 649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
Daniel Maya fc83121969 Changed event criticity 2020-11-26 13:22:59 +01:00
alejandro-campos b36d03a19d changed mail to admin default action 2020-11-26 09:44:56 +01:00
Daniel Barbero Martin 564b389603 fix inserts demo VC 2020-11-23 13:49:59 +01:00
Marcos Alconada 8e4c62a0e9 fixed error 2020-10-29 18:20:33 +01:00
daniel 3455de7f85 fixed visual errors and default values 2020-10-07 16:03:52 +02:00
daniel a5d5a45cac add render graph to reports 2020-10-02 14:16:55 +02:00
Daniel Rodriguez ccbbd7909b Merge branch 'ent-6342-10704-wmi-errores-modulos-nuevos-cpu-disk-services-etc' into 'develop' 
Ent 6342 10704 wmi errores modulos nuevos cpu disk services etc

See merge request artica/pandorafms!3475
 2020-09-30 10:25:32 +02:00
Kevin b1c4a9890e Merge branch 'master' of brutus.artica.es:artica/pandorafms into ent-6022-uptime-incorrecto-en-politica-mejorada-windows 2020-09-25 11:46:08 +02:00
fbsanchez 04aa92ca0d Updated field number for WMI checks (new installations) 2020-09-22 10:35:56 +02:00
fbsanchez c43c331d58 pandoradb_data.sql review, column selected in wmi modules 2020-09-21 18:13:18 +02:00
daniel b96cade165 new options 24x7 sla,availavility reports 2020-08-31 12:33:41 +02:00
Jose Gonzalez 3c0ea8b08a Solved issues with DB 2020-08-10 15:10:17 +02:00
Jose Gonzalez 35644a367f Added ttag modifies 2020-08-10 14:53:07 +02:00
fbsanchez 5df418d226 MR changes 2020-07-09 16:56:51 +02:00
José González 311b259684 Backup upload 2020-06-30 12:16:51 +02:00
Kevin Rojas ca019d1909 Update pandoradb_data.sql 2020-06-17 17:34:38 +02:00
Kevin Rojas a8cf1550ce Fix Uptime module 2020-06-17 17:26:20 +02:00
vanessa gil 71e64e7e43 Updated MR version. 2020-06-02 19:22:50 +02:00
artica c127ed84f0 Updated version and build strings. 2020-06-02 18:19:16 +02:00
alejandro-campos 1140a4345a added new module type 2020-05-04 12:20:50 +02:00
Kike 801624b8a2 Deleted [RT] tag for recon templates 2020-04-07 14:04:06 +02:00
Kike d908a9f7f6 Added default modules templates for recon tasks 2020-04-02 19:12:49 +02:00
daniel 709201bf23 dashboards 2020-03-26 12:29:38 +01:00
alejandro-campos e05c292d7d show last status change of module 2020-03-23 12:47:58 +01:00
Daniel Barbero 19b571fc78 update version 2020-03-03 10:17:18 +01:00
artica 015b1b55b2 Updated version and build strings. 2020-03-02 11:01:26 +01:00
Tatiana Llorente c820a32b53 Ent 4492 consola visual por paises 2020-02-28 14:37:44 +01:00
Daniel Maya 30e1021877 Fixed conflict in tpolicies 2020-02-28 08:51:00 +01:00
Daniel Maya 9f01356b6f conflict resolved 2020-02-24 09:49:25 +01:00
Daniel Rodriguez b0f0ef3f98 Merge branch 'policies-rework' into 'develop' 
Replaced old policies with reworked ones

See merge request artica/pandorafms!3060
 2020-02-21 13:51:17 +01:00
Kevin e6ff0b22ac Added missing information to Solaris policy 2020-02-21 10:27:20 +01:00
Daniel Maya 4e4c1495eb Fixed merge conflict 2020-02-20 15:07:14 +01:00
Daniel Maya 87dc92ffd9 Ent 5457 suid nodos elastic 2020-02-18 13:24:22 +01:00
Kevin 15a4bd0763 Replaced old policies with reworked ones 2020-02-14 11:18:21 +01:00
Daniel Maya 1e4217d1c6 Changed Inserts in tpolicy 2020-02-13 09:22:57 +01:00
Daniel Maya baecac1efb Next mr 2020-01-29 15:51:39 +01:00
artica 2f6fed368d Updated version and build strings. 2020-01-29 10:13:37 +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
daniel 3dbdfdb6eb Fix Landscape reports 2019-12-11 15:07:38 +01:00
Luis 6ba4a26564 Added timeoout option to command event responses 2019-12-10 11:54:30 +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 960326b980 Add menu omnishell 2019-11-21 18:21:46 +01:00
fbsanchez 446d6c3507 Fix windows commands 2019-11-20 12:35:55 +01:00
Daniel Barbero Martin 1b5dcc3e28 Fixed errors in remote command 2019-11-19 12:35:52 +01:00
fbsanchez f4f618c1da Merge remote-tracking branch 'origin/ent-EDF' into ent-4769-modulos-ssh-php-perl 2019-11-05 15:40:14 +01:00
fbsanchez 58cbc3c738 Merge remote-tracking branch 'origin/develop' into ent-EDF 
Conflicts:
	pandora_console/extras/mr/33.sql
	pandora_console/pandoradb_data.sql
 2019-11-05 15:17:09 +01:00
fbsanchez ec3c7ba559 Some remote command examples 2019-11-04 20:36:03 +01:00
Alejandro Fraguas 777bbdd180 Merge branch '4581-sample-agent-nueva-funcionalidad' into 'develop' 
Added feature sample_agent

See merge request artica/pandorafms!2826
 2019-11-04 17:54:33 +01:00
fbsanchez 383967f68a Merge branch 'ent-4769-modulos-ssh-php-perl' into ent-EDF 2019-10-29 16:56:01 +01:00
fbsanchez 6478c7a51f minor tips quickshell 2019-10-29 15:55:39 +01:00
fbsanchez 7accbc97c4 Merge remote-tracking branch 'origin/develop' into ent-4769-modulos-ssh-php-perl 2019-10-28 12:36:19 +01:00
artica 3094d5af05 Updated version and build strings. 2019-10-28 12:35:59 +01:00
Jose Gonzalez b0db7c729d Solved minor issues 2019-10-24 16:23:58 +02:00
Jose Gonzalez 29bcd379f7 Added changes for liking with visual consoles 2019-10-24 11:53:35 +02:00
fbsanchez 6bf3772690 remote cmd => remote execution 2019-10-09 19:20:58 +02:00
Daniel Barbero 8af72c1c9d add Remote CMD 2019-10-09 17:26:06 +02:00
Daniel Barbero Martin 2ee725b204 fixed minor error 2019-09-26 16:43:31 +02:00
artica 574d9b13d6 Updated version and build strings. 2019-09-26 16:32:58 +02:00
alejandro-campos 96622933fc added new section in integria setup to configure different options for event responses and alert created tickets 2019-09-26 13:22:10 +02:00
Alejandro Campos 20cebbe988 Merge branch 'develop' into 'ent-4461-Configuracion-integracion-integria' 
# Conflicts:
#   pandora_console/extras/mr/32.sql
 2019-09-23 17:16:15 +02:00
alejandro-campos 9bf2980f01 fix minor bugs in integria integration 2019-09-23 12:48:20 +02:00
Marcos Alconada 6107d141c0 Update pandoradb_data.sql 2019-09-19 12:40:53 +02:00
Marcos Alconada a468c79a67 Changed visual console ID 2019-09-04 10:05:44 +02:00
marcos.alconada b18f72dcdd Add new visual console Host Alive Keep Alive 2019-09-03 13:04:12 +02:00
Daniel Maya 5ad22620b9 mr power up 2019-08-28 12:49:41 +02:00
Alejandro Fraguas 23cdc419a9 Merge branch 'ent-4397-visual-console-racks-branch2' into 'develop' 
Ent 4397 visual console racks branch2

See merge request artica/pandorafms!2650
 2019-08-19 13:55:51 +02:00
artica c0588d95ca Updated version and build strings. 2019-08-13 12:27:44 +02:00
Luis Calvo 72c4b55477 Corregida errata comentario 2019-08-09 10:52:25 +02:00
Luis Calvo 4fe4e58874 Re-uploaded visual-console rack images and db data 2019-08-09 10:46:47 +02:00
Luis Calvo 0cb0a63a8f Re-uploaded visual-console rack images and db data 2019-08-09 10:42:44 +02:00
Alejandro Campos 12eacc1933 Merge branch 'develop' into 'ent-4388-Nuevos-eventos' 
# Conflicts:
#   pandora_console/extras/mr/31.sql
#   pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
 2019-08-05 09:26:18 +02:00
alejandro-campos 927b1fa37f removed all deprecated references to integria from code and db data 2019-07-31 16:46:26 +02:00
alejandro-campos b4bd7f0f63 fixed problems in event view and event view custom fields 2019-07-30 16:10:34 +02:00
Daniel Barbero Martin 0064bc0cba fixed errors 2019-07-01 17:07:39 +02:00
Daniel Barbero Martin a10cf51b1b update current package 2019-06-26 15:37:04 +02:00
marcos.alconada 1e843777bc Delete line with log4x 2019-06-07 10:57:15 +02:00
Marcos Alconada d49d303469 Update pandoradb_data.sql 2019-06-07 10:20:29 +02:00
Marcos Alconada be82afc9c5 Update pandoradb_data.sql 2019-06-07 09:50:49 +02:00
Marcos Alconada 241eda5c39 Revert "Merge branch 'ent-3626-referencias-log4x' into 'develop'" 
This reverts merge request !2282
 2019-06-07 09:35:13 +02:00
marcos.alconada a13dab3f35 resolving merge conflict 2019-06-07 09:22:07 +02:00
fbsanchez 5e9b2479eb Merge remote-tracking branch 'origin/develop' into ent-1668-update-manager 2019-05-20 13:11:39 +02:00
fbsanchez ec60a3193a removed all group from communications target 
Former-commit-id: 797a467fed8eff0f9a81c9bbe72780f4e91faa67
 2019-05-16 12:52:41 +02:00
fbsanchez 3bf06f0b72 MR minor updates 
Former-commit-id: 55105f3858b8ec659c67bf906b09afeb61a1d39c
 2019-05-15 00:00:21 +02:00
fbsanchez 8004e096fd MR 28 and minor fixes 
Former-commit-id: 99292ecb6401cf20066dd09188a32e24b9194b25
 2019-05-14 18:09:34 +02:00
fbsanchez 920786216b UM notifications MR update 
Former-commit-id: 61be93c1174fbff4242e261caac591725d7ef4c5
 2019-05-14 17:17:04 +02:00
Marcos Alconada cf45be2c60 Merge branch 'develop' into 'ent-4020-cambiar-mensaje-de-bienvenida-tnews' 
# Conflicts:
#   pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql

Former-commit-id: b3872691ef8ef136cd921c5eb4365be2b32daf46
 2019-05-14 10:03:37 +02:00
marcos.alconada 9501187ebc Se cambian las consultas sql sin la imagen en la consulta 
Former-commit-id: fcfc9e05c4107f5b85b1a8f6140155fafe316c8e
 2019-05-14 10:01:30 +02:00