Commit Graph

4362 Commits

Author SHA1 Message Date
Daniel Rodriguez 126030261b Merge branch 'ent-7969-Etiquetas-HTML-en-módulos-de-wizard-Consolas-Visuales' into 'develop'
Ent 7969 etiquetas html en módulos de wizard consolas visuales

See merge request artica/pandorafms!4394
2021-09-22 09:01:17 +00:00
Daniel Rodriguez ce40b36923 Merge branch 'ent-7582-anadir-selector-horas-eventos' into 'develop'
Ent 7582 anadir selector horas eventos

Closes pandora_enterprise#7582

See merge request artica/pandorafms!4266
2021-09-21 13:17:30 +00:00
Jose Gonzalez cd1b7daa00 Fix select fields size 2021-09-20 12:16:08 +02:00
Jose Gonzalez 3af47c0e5f Open network maps 2021-09-17 10:45:01 +02:00
Calvo 0778952461 Merge remote-tracking branch 'origin/develop' into ent-7449-autorefresh-en-vistas-que-no-existen 2021-09-16 16:32:27 +02:00
Daniel Rodriguez 6599f80dff Merge branch 'ent-7444-Metaconsole-Triggered-alerts-report' into 'develop'
Fixed forget metaconsole alerts

Closes pandora_enterprise#7444

See merge request artica/pandorafms!4388
2021-09-08 10:14:22 +00:00
Daniel Maya 240caa3ad1 #7969 Fixed span with truncate 2021-09-08 12:14:03 +02:00
Daniel Maya 24670da399 #7950 Fixed last_contact 2 2021-09-07 14:47:54 +02:00
Jose Gonzalez bb743cb87f Fixed forget metaconsole alerts 2021-09-06 14:08:24 +02:00
Jose Gonzalez fa101db3b6 Fix vulnerability 2021-09-03 13:30:15 +02:00
Daniel Maya 5bf70f876c #7950 Fixed last_contact 2021-09-02 16:12:46 +02:00
Daniel Rodriguez b8e1391ffd Merge branch 'ent-7911-errores-file-manager' into 'develop'
Fixed issues with files upload

Closes pandora_enterprise#7911

See merge request artica/pandorafms!4370
2021-09-01 13:18:10 +00:00
Calvo 3204fdb71f Merge remote-tracking branch 'origin/develop' into ent-7844-revision-acl-enterprise-parte-3-fallos-actuales 2021-09-01 11:06:20 +02:00
Daniel Rodriguez 8397f778b3 Merge branch 'ent-6885-11172-añadir-opcion-de-nor-en-monitor-detail' into 'develop'
add not option in monitor detail filter

See merge request artica/pandorafms!4112
2021-09-01 08:54:49 +00:00
marcos 80f4e25b92 change first option value when not_condition its enabled 2021-08-30 11:19:53 +02:00
Daniel Rodriguez a89faed47c Merge branch 'ent-7823-interfaces-view-no-calcula-bien-last-data' into 'develop'
Fixed issue with last_data obtain

Closes pandora_enterprise#7823

See merge request artica/pandorafms!4338
2021-08-27 10:46:39 +00:00
marcos 2ed657c166 updates 2021-08-26 12:42:16 +02:00
Jose Gonzalez 945c29d1bc Fix issues 2021-08-26 11:15:02 +02:00
Daniel Rodriguez 22587a0dde Merge branch 'ent-7036-11346-Introducir-el-campo-de-IP-del-agente-en-la-vista-de-eventos' into 'develop'
Ent 7036 11346 introducir el campo de ip del agente en la vista de eventos

See merge request artica/pandorafms!4275
2021-08-25 13:00:42 +00:00
Daniel Rodriguez 3be8971360 Merge branch 'ent-7887-Vulnerabilidad-xss-en-operaciones-masivas-de-módulos' into 'develop'
Ent 7887 vulnerabilidad xss en operaciones masivas de módulos

See merge request artica/pandorafms!4365
2021-08-25 12:52:06 +00:00
Daniel Rodriguez 8a574a2f93 Merge branch 'ent-7920-metacosola-gestion-de-usuarios-locales' into 'develop'
Re-enabled user management in MC while not in centralised environment

See merge request artica/pandorafms!4369
2021-08-24 12:28:03 +00:00
marcos 24a66f0173 updates 2021-08-24 13:30:50 +02:00
Daniel Rodriguez 4d5926e427 Merge branch 'ent-7612-implementar-sistema-de-mensajeria-en-la-meta' into 'develop'
Ent 7612 implementar sistema de mensajeria en la meta

See merge request artica/pandorafms!4353
2021-08-24 08:13:02 +00:00
fbsanchez 4ff6b8a1bb Re-enabled user management in MC while not in centralised environment 2021-08-23 12:29:17 +02:00
marcos 4d270a3559 set first option select2 all to none if not condition is enabled 2021-08-23 09:52:42 +02:00
marcos 61409b72b4 Merge remote-tracking branch 'origin/develop' into ent-6885-11172-añadir-opcion-de-nor-en-monitor-detail 2021-08-23 08:52:17 +02:00
Daniel Maya 9488ce873b #7887 Fixed xss in massive modules 2021-08-19 12:57:16 +02:00
Daniel Rodriguez fe30b9c785 Merge branch 'ent-7445-Fallo-al-almacenar-dato-string-en-tevento-dentro-de-un-evento-Alert-fired' into 'develop'
implemented capacity to handle string data for event data

See merge request artica/pandorafms!4184
2021-08-17 12:19:54 +00:00
Calvo 34c3b00426 WIP: Revision ACL part 3 2021-08-13 15:57:01 +02:00
Calvo fcbd69c603 Deleted js traces 2021-08-12 14:16:25 +02:00
fbsanchez 3109975e7d Notifications in MC 2021-08-12 12:01:24 +02:00
fbsanchez 034e921e35 Upgraded jquery to 3.6.0, without npm 2021-08-12 09:30:43 +02:00
Daniel Rodriguez 77d00fd9e2 Merge branch 'ent-7647-vulnerabilidad-xss-en.nombre.filtro-eventos' into 'develop'
Fixedd XSS on load filter event name

See merge request artica/pandorafms!4174
2021-08-09 09:00:15 +00:00
Alejandro Campos ff93169049 Merge branch 'develop' into 'ent-7445-Fallo-al-almacenar-dato-string-en-tevento-dentro-de-un-evento-Alert-fired'
# Conflicts:
#   pandora_console/extras/mr/48.sql
2021-08-09 06:45:46 +00:00
Daniel Rodriguez 2224709814 Merge branch 'ent-7543-11772-command-snapshot-view-fondo-blanco-en-tema-oscuro' into 'develop'
se command sanpshot black theme

See merge request artica/pandorafms!4232
2021-08-06 12:57:05 +00:00
Daniel Rodriguez fa2cec2878 Merge branch 'ent-7387-fallos-netflow-live-view' into 'develop'
Fixed issues with views in Netflow live view

Closes pandora_enterprise#7387

See merge request artica/pandorafms!4240
2021-08-05 11:08:04 +00:00
Daniel Maya f9c95e0145 oMerge branch 'develop' into ent-7273-Consola-Visual-nuevo-elemento-Gráfica-básica 2021-08-04 09:57:57 +02:00
Daniel Rodriguez 871f6102f1 Merge branch 'ent-7564-no-funciona-correctamente-buscador-politicas' into 'develop'
Fixed some errors and fixed issue finding policies

Closes pandora_enterprise#7564

See merge request artica/pandorafms!4149
2021-08-03 06:46:32 +00:00
Daniel Rodriguez 2963d67225 Merge branch 'ent-7767-secondary-groups-no-se-anaden-agente' into 'develop'
Improve code for get secondary groups

Closes pandora_enterprise#7767

See merge request artica/pandorafms!4259
2021-08-02 07:18:02 +00:00
Calvo 9b736d0c48 Deleted and reubicated acl options 2021-07-30 13:49:22 +02:00
José González b23aafdf03 Fixed issue with last_data obtain 2021-07-30 12:35:08 +02:00
Calvo a8c0ba8e78 Include modules not init in total monitors count on tactical view 2021-07-19 13:20:00 +02:00
Daniel Maya 71767a3f11 Added basic chart 2021-07-16 14:16:45 +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 3d5ae6887c Event migration warnings popups 2021-07-07 16:11:20 +02:00
Daniel Maya 66e9539818 Added agent ip in custom events 2021-07-07 16:07:08 +02:00
Calvo c44593be8a Revomved autorefresh views than does not exists on meta 2021-07-06 10:14:59 +02:00
José González 47b6e40799 Added controls for filter with hours 2021-07-05 17:42:45 +02:00
José González a9075463ac Missed change 2021-07-02 13:48:59 +02: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
José González fb129750d5 Fixed issues with views in Netflow live view 2021-06-28 12:03:25 +02:00
fbsanchez 760522aeff Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-28 11:03:09 +02:00
fbsanchez 36f6ad4ee2 Merge remote-tracking branch 'origin/develop' into ent-6661-giss-agregar-elementos-en-servicios
Conflicts:
	pandora_console/include/styles/meta_dashboards.css
2021-06-28 10:37:49 +02:00
marcos 26acac191f ad not condition on monitor detail 2021-06-25 09:37:26 +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
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
fbsanchez 36e455e5c5 Fixes for agent_module widget 2021-06-23 18:00:54 +02:00
marcos fafcef7e85 se command sanpshot black theme 2021-06-23 17:35:16 +02:00
fbsanchez 76fbf75572 Fix for filtering common modules 2021-06-23 14:31:42 +02:00
fbsanchez be09c1c64d Some changes, multibox fixes for metaconsole 2021-06-23 14:24:16 +02:00
fbsanchez 9fb7074082 minor fix 2021-06-22 19:44:41 +02:00
fbsanchez 390bf14761 cover for bulk service operations in mc/node 2021-06-22 15:32:15 +02:00
fbsanchez fc0b605cee Merge remote-tracking branch 'origin/develop' into ent-6661-giss-agregar-elementos-en-servicios 2021-06-21 12:13:46 +02:00
fbsanchez 1f34cf8596 Massive operation over service elements 2021-06-18 15:36:52 +02:00
marcos 56b6418716 add not condition filter 2021-06-17 15:04:21 +02:00
marcos dff7220be9 add not condition filter 2021-06-17 14:59:43 +02:00
fbsanchez 94cd4c96dd Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
	pandora_console/include/javascript/pandora_ui.js
2021-06-14 17:37:01 +02:00
fbsanchez cdad04f9cd Update the DB schema when upgrading from RPMs.
Call updateMR.php to update the database schema when manually upgrading
from RPM packages.
2021-06-14 11:56:42 +00:00
marcos 0cfb7c994f fixed merge conflict 2021-06-14 11:02:57 +02:00
marcos ee4a3dc450 fixed merge conflict 2021-06-14 10:52:50 +02:00
marcos 5162864b28 fixed merge conflict 2021-06-14 09:03:17 +02:00
marcos 0ab343e672 merge conflict 2021-06-14 08:26:33 +02:00
fbsanchez ae34209f52 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-10 21:45:50 +02:00
Marcos Alconada 665efa4fb7 Ent 7519 cambio de fuentes en la consola a nivel global 2021-06-10 08:19:11 +00:00
Daniel Barbero Martin a9864f7d87 Wip command center, clean functions db 2021-06-10 08:45:50 +02:00
Daniel Rodriguez 4b819360ff Revert "Merge branch 'ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global' into 'develop'"
This reverts merge request !4132
2021-06-09 18:09:43 +02:00
Marcos Alconada 2334eccd01 Ent 7519 cambio de fuentes en la consola a nivel global 2021-06-09 13:59:28 +00:00
alejandro.campos@artica.es 240efc4dcf truncate string 2021-06-08 16:48:01 +02:00
alejandro.campos@artica.es fdc6d2f4c8 implemented capacity to handle string data for event data 2021-06-08 16:09:37 +02:00
Daniel Barbero Martin 8b7c5c08c6 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-07 08:32:15 +02:00
Calvo 2f3cae8d61 Fixedd XSS on load filter event name 2021-06-04 13:36:32 +02:00
Marcos Alconada 3bc2844b4d fixed visual error black theme 2021-06-04 11:03:35 +00:00
Daniel Rodriguez d11ddfe059 Merge branch 'ent-7342-Bug-en-busqueda-de-usuarios' into 'develop'
fixed bug in users search

See merge request artica/pandorafms!4085
2021-06-04 07:49:56 +00:00
Daniel Barbero Martin ca59034cf3 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-04 08:13:20 +02:00
Jose Gonzalez 08c945d91d Fixed missed buttons, improve code and added go back button when create-update 2021-06-03 15:37:11 +02:00
Daniel Rodriguez 5040b4b265 Merge branch 'ent-7602-XSS-nombre-consolas-visuales' into 'develop'
Improved code and fix xss vulnerability

Closes pandora_enterprise#7602

See merge request artica/pandorafms!4157
2021-06-03 11:37:15 +00:00
Daniel Barbero Martin ea90a61b06 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-02 18:27:15 +02:00
alejandro.campos@artica.es 9513386ff7 prevent nonadmin users from viewing admin users in pandora search 2021-06-02 12:47:55 +02:00
fbsanchez 70b8eb77a3 Remove service elements when removing items itselves and multiple fixes 2021-06-01 12:12:07 +02:00
Daniel Barbero Martin d88520f752 Wip command center 2021-05-28 14:32:41 +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 Rodriguez 3f8d3a883f Merge branch 'ent-7002-Revision-cabeceras-tabs' into 'develop'
Ent 7002 revision cabeceras tabs

Closes pandora_enterprise#7002

See merge request artica/pandorafms!4094
2021-05-27 16:21:48 +00:00
Luis 6681d9fd67 Integria tickets table visual fix 2021-05-27 16:21:17 +00:00
José González 3aee7e7c4d Improved code and fix xss vulnerability 2021-05-27 14:55:01 +02:00
marcos c4c772032a add help string on status monitor not condition 2021-05-26 10:35:35 +02:00
José González e7b59ab472 Added standarized headers 2021-05-26 10:16:23 +02:00
Daniel Barbero Martin d91e7f6aba Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-26 08:28:42 +02:00
Daniel Rodriguez 96741c1864 Merge branch 'ent-7246-icono-vista-informes-y-custom-graphs' into 'develop'
Fixed view icon on report and custom graphs

See merge request artica/pandorafms!4002
2021-05-25 15:53:05 +00:00
Daniel Barbero Martin 6b248da428 Wip command center 2021-05-25 17:39:21 +02:00
José González 76628117fa Merge branch 'develop' into 'ent-7002-Revision-cabeceras-tabs'
# Conflicts:
#   pandora_console/operation/messages/message_edit.php
2021-05-25 13:50:17 +00:00
Daniel Maya e6713c2f2c #6917 metaconsole config changes 2021-05-25 09:58:18 +00:00
Daniel Barbero Martin 337450a1f8 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
Conflicts:
	pandora_console/ajax.php
	pandora_console/extras/delete_files/delete_files.txt
2021-05-24 17:41:28 +02:00
Daniel Barbero Martin 0b36853553 Wip command center 2021-05-24 17:35:15 +02:00
Junichi Satoh 362855a24e Fixed to follow ACL with get_agents_group_json. 2021-05-24 18:56:18 +09:00
José González d3bd24fc18 Fixed some errors and fixed issue finding policies 2021-05-24 11:01:50 +02:00
fbsanchez 538e7beb48 Public access using PublicLogin interface 2021-05-19 11:57:17 +02:00
fbsanchez 09ccaf254e Fixed public access and added PublicLogin interface, including code style fixex 2021-05-19 11:31:52 +02:00
Daniel Barbero Martin 3eba993c5c Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-19 08:36:26 +02:00
Daniel Barbero Martin ec6cb4d532 fix category, Os, tags, user_edit synch 2021-05-18 10:57:21 +02:00
fbsanchez 9666b76fa9 Common requirements using base url 2021-05-18 10:56:40 +02:00
Daniel Rodriguez b8fe685028 Merge branch 'ent-7482-Integracion-Pandora-Integria-credenciales-de-usuario' into 'develop'
implemented user level authentication for integria ims integration

See merge request artica/pandorafms!4117
2021-05-17 14:41:11 +00:00
alejandro.campos@artica.es 663d1dcf75 minor fix 2021-05-17 13:43:20 +02:00
Daniel Rodriguez 203310d13b Merge branch 'ent-7538-traza-en-tree-view-nodo' into 'develop'
remove vamos a ver

See merge request artica/pandorafms!4126
2021-05-14 09:39:07 +00:00
Daniel Rodriguez 5b2c340163 Merge branch 'ent-6085-Bandwidth-view-vista-de-interfaces' into 'develop'
Create interface views

See merge request artica/pandorafms!4023
2021-05-14 09:37:48 +00:00
alejandro.campos@artica.es 2c065d6f38 visual fix 2021-05-14 10:14:53 +02:00
alejandro.campos@artica.es 86447e2a0b visual fix 2021-05-14 10:10:42 +02:00
alejandro.campos@artica.es 172afc9070 minor change 2021-05-13 13:40:09 +02:00
Alejandro Campos caaa9c407e Merge branch 'develop' into 'ent-7482-Integracion-Pandora-Integria-credenciales-de-usuario'
# Conflicts:
#   pandora_console/extras/mr/47.sql
#   pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php
2021-05-13 11:39:24 +00:00
alejandro.campos@artica.es 9cde8c345f removed deprecated incident permissions 2021-05-13 13:33:45 +02:00
marcos d711d71392 remove vamos a ver 2021-05-13 13:09:42 +02:00
Daniel Rodriguez ed4e89a4d0 Merge branch 'ent-7517-11735-fallo-graficas-snmp-interface-en-vista-de-agente-con-black-theme' into 'develop'
fixed visual error on snmp interfaces agent graphs  black theme

See merge request artica/pandorafms!4119
2021-05-12 12:52:44 +00:00
Marcos Alconada f8eafa5015 fixed visual error on snmp interfaces agent graphs black theme 2021-05-12 12:52:44 +00:00
Daniel Rodriguez 4e871ed296 Merge branch 'ent-6983-typo-en-traduccion' into 'develop'
fixed wrong string

See merge request artica/pandorafms!4099
2021-05-12 07:55:09 +00:00
Daniel Rodriguez 8a3d977e82 Merge branch 'ent-5401-Búsqueda-de-módulo-por-ID-al-llegar-desde-link-de-consola' into 'develop'
Ent 5401 búsqueda de módulo por id al llegar desde link de consola

See merge request artica/pandorafms!4026
2021-05-11 15:38:01 +00:00
Daniel Rodriguez fb539be410 Merge branch 'ent-7479-Integracion-Integria-IMS-falla-subida-de-adjuntos' into 'develop'
fixed bug in file attachment

See merge request artica/pandorafms!4102
2021-05-11 07:40:54 +00:00
Daniel Rodriguez b6169575a9 Merge branch 'ent-7155-bug-edicion-tickets-integria' into 'develop'
Ent 7155 bug edicion tickets integria

See merge request artica/pandorafms!3991
2021-05-10 09:17:14 +00:00
Luis a94c70551d Ent 7155 bug edicion tickets integria 2021-05-10 09:17:14 +00:00
Daniel Rodriguez a0197dab87 Merge branch 'ent-7453-Busqueda-alertas-en-vista-de-agente-no-funciona' into 'develop'
Ent 7453 busqueda alertas en vista de agente no funciona

See merge request artica/pandorafms!4084
2021-05-10 09:15:40 +00:00
Daniel Rodriguez 514a91c853 Merge branch 'ent-6541-quitar-id-usuario-url-seccion-usuario' into 'develop'
Ent 6541 quitar id usuario url seccion usuario

Closes pandora_enterprise#6541

See merge request artica/pandorafms!3990
2021-05-10 09:08:59 +00:00
Daniel Rodriguez 6faefa4afa Merge branch 'ent-7096-unificar-nombres-downtimes' into 'develop'
Unified downtime name as scheduled downtime

See merge request artica/pandorafms!4001
2021-05-10 09:06:43 +00:00
Luis f25256a74d Unified downtime name as scheduled downtime 2021-05-10 09:06:43 +00:00
Daniel Rodriguez b609bbfdd9 Merge branch 'ent-7240-error-acl-graficas-tree-view' into 'develop'
Fixed metaconsole ACL on module graphs view

See merge request artica/pandorafms!3987
2021-05-10 08:15:50 +00:00
alejandro.campos@artica.es fdeaf52912 implemented user level authentication for integria ims integration 2021-05-07 14:29:29 +02:00
marcos e526cfbfad add not option in monitor detail filter 2021-05-07 11:16:28 +02:00
marcos 943232ed7e add not option in monitor detail filter 2021-05-07 09:32:54 +02:00
marcos 243d1fb1ec remove vamos a ver, que figura marcos 2021-05-06 17:09:50 +02:00
marcos f03364bf96 add not option in monitor detail filter 2021-05-06 17:08:11 +02:00
José González ce5934b9a1 Added form-type buttons for user-actions 2021-05-06 14:46:58 +02:00
Daniel Rodriguez 77a1de6b1b Merge branch 'ent-7285-No-aparece-mensaje-en-el-TreeView-al-filtrar' into 'develop'
Ent 7285 no aparece mensaje en el tree view al filtrar

See merge request artica/pandorafms!4018
2021-05-06 12:26:58 +00:00
Daniel Rodriguez 8b3ad8602a Merge branch 'ent-7097-varios-bugs-mensajes' into 'develop'
Ent 7097 varios bugs mensajes

Closes pandora_enterprise#7097

See merge request artica/pandorafms!3996
2021-05-06 12:25:03 +00:00
Daniel Rodriguez dd014596d6 Merge branch 'ent-7117-Guardar-puerto-al-crear-network-component-desde-el-SNMP-Browser' into 'develop'
Ent 7117 guardar puerto al crear network component desde el snmp browser

See merge request artica/pandorafms!3943
2021-05-06 12:06:21 +00:00
alejandro.campos@artica.es 256750bcb0 fixed bug in file attachment 2021-05-05 09:51:21 +02:00
marcos 1f5e08a9fe fixed wrong string 2021-05-05 09:23:47 +02:00
José González 0dc1ec449c Added standard headers 2021-04-30 14:44:03 +02:00
José González cea27392c8 Added standard header 2021-04-30 13:39:10 +02:00
José González 46a691c397 Added standard headers 2021-04-30 13:24:55 +02:00
José González 3f33a0ec29 Added standard header 2021-04-30 12:35:02 +02:00