Commit Graph

921 Commits

Author SHA1 Message Date
Daniel Cebrian 62a70dee2c #11326 added new section and validated if exist plugin 2023-07-24 18:42:27 +02:00
Pablo Aragon 8389169e16 Merge branch 'develop' into ent-10640-meter-programador-de-informes-en-la-vista-de-edicion-de-un-informe-en-una-nueva-solapa 2023-07-24 08:40:33 +02:00
Daniel Cebrian 2d0fe4b149 #11326 added design 2023-07-20 15:13:58 +02:00
daniel 3e2c2990df Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-07-20 08:28:36 +02:00
Rafael Ameijeiras 9ff13234be Merge branch 'ent-10696-nuevo-widget-netflow' into 'develop'
Ent 10696 nuevo widget netflow

See merge request artica/pandorafms!5890
2023-07-19 11:54:01 +00:00
daniel 5cf31fc77e ITSM fixed pandora_enterprise#11471 2023-07-19 11:36:03 +02:00
Daniel Cebrian 41a03a7a49 Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery 2023-07-18 09:27:14 +02:00
Rafael Ameijeiras dffb9d5bbf Merge branch 'ent-11493-nuevo-widget-colmena-de-agentes-agent-hive' into 'develop'
Ent 11493 nuevo widget colmena de agentes agent hive

See merge request artica/pandorafms!6085
2023-07-18 05:30:04 +00:00
Daniel Maya a0dc60a49f #11493 Added png 2023-07-17 14:57:54 +02:00
Daniel Cebrian 42540065cd #11490 new widget group status map 2023-07-17 08:30:47 +02:00
Rafael Ameijeiras d860d613d6 Merge branch 'ent-10598-nuevo-wizard-de-bienvenida' into 'develop'
Ent 10598 nuevo wizard de bienvenida

See merge request artica/pandorafms!6043
2023-07-17 05:57:29 +00:00
miguel angel rasteu e3496a44b6 #11206 Add custom field view in nodes 2023-07-11 16:52:39 +02:00
Jorge Rincon 12c538421a #11543 added the pandora FMS logo in black 2023-07-05 09:53:05 +02:00
Matias Didier 321a048d80 Merge branch 'ent-11162-bugs-visuales-en-vista-de-servicios' into 'develop'
Ent 11162 bugs visuales en vista de servicios

See merge request artica/pandorafms!5876
2023-07-03 15:23:52 +00:00
Jonathan 1c7e7e8ee1 #11162 new service icon 2023-07-03 15:12:47 +02:00
Daniel Cebrian d2413ed461 Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery 2023-06-26 13:15:09 +02:00
Daniel Cebrian cc20640acd #11316 new modal help 2023-06-26 09:19:26 +02:00
Pablo Aragon 6ad77676c4 11620-Login background 772 2023-06-19 15:50:05 +02:00
Daniel Cebrian 363f29d333 Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery 2023-06-14 11:23:32 +02:00
Daniel Cebrian 308879fe05 #9771 moved discovery to open 2023-06-14 11:09:08 +02:00
Daniel Cebrian 81991cc4fe #10696 new icon netflow 2023-06-12 10:48:10 +02:00
Jonathan ae526d5df0 #10598 New wizard welcome 2023-05-23 16:54:40 +02:00
Rafael Ameijeiras 7089b12256 Merge branch 'ent-10994-icono-borroso-en-edicion-de-custom-graph' into 'develop'
Ent 10994 icono borroso en edicion de custom graph

See merge request artica/pandorafms!5740
2023-05-22 16:00:55 +00:00
miguel angel rasteu 404c606243 #10994 Add graph container svg 2023-05-22 13:22:05 +02:00
Daniel Cebrian e737cb4f01 #10696 added image netflow widget 2023-05-16 13:36:32 +02:00
Matias Didier 0d15fe4721 Merge branch 'ent-11123-cambiar-imagen-de-no-hay-datos-por-defecto' into 'develop'
Ent 11123 cambiar imagen de no hay datos por defecto

See merge request artica/pandorafms!5842
2023-05-16 08:25:54 +00:00
miguel angel rasteu 9659f58b31 #11123 Add same image with other name 2023-05-16 09:47:23 +02:00
Pablo Aragon 7ed61cca75 10640-Report task 2023-05-10 08:43:29 +02:00
miguel angel rasteu d522c8ad97 #11123 Change image no_data_toshow 2023-05-08 09:01:41 +02:00
Pablo Aragon 7cf69ae101 11058-New welcome message 2023-05-08 08:49:35 +02:00
Daniel Rodriguez 9b69ec4393 Merge branch 'ent-10179-wizard-deploy-agentes' into 'develop'
Ent 10179 wizard deploy agentes

See merge request artica/pandorafms!5692
2023-05-04 14:37:48 +00:00
Matias Didier 1d81b67082 Merge branch 'ent-10530-giss-demasiados-modulos-en-cola-en-vista-de-servidores' into 'develop'
Ent 10530 giss demasiados modulos en cola en vista de servidores

See merge request artica/pandorafms!5688
2023-05-03 09:25:04 +00:00
Daniel Maya 87a55dd26a #10530 Added img 2023-05-03 09:32:52 +02:00
Alejandro Campos 539ff07aec Merge branch 'develop' into 'ent-10179-wizard-deploy-agentes'
# Conflicts:
#   pandora_console/include/styles/pandora.css
2023-04-28 08:07:10 +00:00
Rafael Ameijeiras 2dc910005f Merge branch 'ent-9555-revision-visual-ui-de-la-vista-movil' into 'develop'
Ent 9555 revision visual ui de la vista movil

See merge request artica/pandorafms!5684
2023-04-24 11:16:30 +00:00
daniel 31a3ceb0d3 add image widget BasicChart pandora_enterprise#10692 2023-04-21 08:13:19 +02:00
Pablo Aragon 6f6a4f6e2e 9555-Styles 2023-04-20 17:20:08 +02:00
alejandro.campos@artica.es a3e1923849 changed icons 2023-04-20 10:02:45 +02:00
miguel angel rasteu 77b1212076 add new icon svg 2023-04-19 10:53:52 +02:00
Jonathan 1efc9dab8e #10959 change style message info header 2023-04-18 16:47:44 +02:00
Pablo Aragon 49d82698b1 9555-Events style & fix scroll pagination 2023-04-18 10:21:17 +02:00
Pablo Aragon bfd00726bf 9555-Header and tactical view 2023-04-17 20:02:16 +02:00
Daniel Rodriguez ccadd5157a Merge branch 'ent-7427-nexcon-datos-de-monitorizacion-con-origen-en-netflow' into 'develop'
Ent 7427 nexcon datos de monitorizacion con origen en netflow

See merge request artica/pandorafms!5604
2023-04-05 11:55:20 +00:00
Pablo Aragon be9be17398 10748 2023-03-31 13:24:20 +02:00
Ramon Novoa 4ff27a09ae Add a new icon for the Netflow Server. 2023-03-31 11:51:25 +02:00
Ramon Novoa 112de35eeb Add Netflow Server information (needs a new icon). 2023-03-31 10:54:48 +02:00
daniel e7d08fe6d3 fixed styles 2023-03-29 14:48:47 +02:00
Diego Muñoz-Reja 6bdecc43e7 Merge branch 'ent-8642-nuevo-widget-heatmap' into 'develop'
Ent 8642 nuevo widget heatmap

See merge request artica/pandorafms!5557
2023-03-27 10:43:48 +00:00
Daniel Maya 52231615f6 Merge branch 'develop' into ent-8642-nuevo-widget-heatmap 2023-03-23 11:51:54 +01:00
Pablo Aragon f32c886167 10712-login 2023-03-23 11:51:21 +01:00
Jose Gonzalez 0bbf8d0344 New dot icon 2023-03-17 08:58:25 +01:00
Jose Gonzalez 6ac41ed907 Icon added 2023-03-15 11:15:04 +01:00
Daniel Maya feff8668be #8642 added img 2023-03-14 16:49:12 +01:00
Daniel Maya 62d1249fe0 #8642 Added heatmap widget 4 2023-03-14 12:47:10 +01:00
Daniel Cebrian e36bb1d065 Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-14 08:36:12 +01:00
daniel d092495482 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-13 19:31:26 +01:00
Jose Gonzalez 3b36545cec New icon 2023-03-13 17:50:36 +01:00
Daniel Cebrian 64cc261483 Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-13 16:48:47 +01:00
daniel 503a1b2c22 Merge remote-tracking branch 'origin/develop' into ent-9680-widget-para-mostrar-modulos-por-estados
Conflicts:
	pandora_console/include/lib/Dashboard/Widget.php
2023-03-13 10:43:38 +01:00
daniel 80c81daafa Merge remote-tracking branch 'origin/develop' into ent-985t push
9-nuevos-widgets-para-mostrar-datos-en-dashboard-avg-sum-max-min

Conflicts:
	pandora_console/operation/agentes/estado_agente.php
2023-03-13 09:23:53 +01:00
Daniel Cebrian dfa2ab818e Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-13 08:53:35 +01:00
daniel dcfaaea016 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-10 14:50:31 +01:00
Jose Gonzalez a065833117 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-10 12:48:50 +01:00
Pablo Aragon 000874ea6e CSV button datatable. IPAM fix 2023-03-10 12:29:13 +01:00
Daniel Cebrian 841478a86c Merge branch 'develop' into 'ent-9073-nuevo-sistema-de-tips-de-bienvenida'
# Conflicts:
#   pandora_console/pandoradb.sql
2023-03-10 10:41:08 +00:00
Jose Gonzalez 5b748d8ec0 Added images 2023-03-10 11:12:26 +01:00
Pablo Aragon 4ebe7ee790 9680-Conflict 2023-03-10 09:38:55 +01:00
Jose Gonzalez ac1db7820c Minor fixes 2023-03-09 17:41:29 +01:00
Daniel Cebrian 3ec11f4c9d Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-08 12:55:53 +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
Pablo Aragon 62afce562f Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-07 08:28:22 +01:00
Pablo Aragon 5aac1a6152 Alerts 2023-03-07 08:28:10 +01:00
Daniel Cebrian 6a54b814f3 #9073 added arrow images and fixed format php 2023-03-06 13:07:39 +01:00
Daniel Cebrian 135793454c #9073 added images 2023-03-06 12:20:08 +01:00
Jose Gonzalez 6a35eb9950 Network map minor fixes 2023-03-06 11:12:59 +01:00
Pablo Aragon daf179f1f6 Conflit resolved 2023-03-06 08:32:28 +01:00
daniel 5d7738a05e Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones
Conflicts:
	pandora_console/extras/mr/62.sql
	pandora_console/include/ajax/module.php
	pandora_console/include/functions_ui.php
	pandora_console/operation/agentes/estado_agente.php
	pandora_console/operation/agentes/status_monitor.php
	pandora_console/operation/events/events.php
2023-03-03 08:20:44 +01:00
Diego Muñoz-Reja 873334fd97 Merge branch 'ent-9622-omnishell-en-la-vista-solapa-de-agente' into 'develop'
Ent 9622 omnishell en la vista solapa de agente

See merge request artica/pandorafms!5508
2023-03-02 14:52:45 +00:00
daniel a5e6e569e8 Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones 2023-03-02 08:04:00 +01:00
daniel 7b1d8a535a fixed styles 2023-03-01 13:19:12 +01:00
Jose Gonzalez 4c3fa9ade8 Changed info icon color 2023-03-01 12:44:22 +01:00
Jonathan c4a0dc1934 SNMP views 2023-02-24 09:51:55 +01:00
Jose Gonzalez d7c70bd8a8 Tree view fixes 2023-02-23 14:30:31 +01:00
Jose Gonzalez 3ba9b752fe Clean unused items 2023-02-20 17:43:42 +01:00
Jose Gonzalez 91393d7ce5 Ticket 10431 Header icons added 2023-02-20 17:22:42 +01:00
Jose Gonzalez da58e4b9e0 Ticket 10484 Fixed List Operating Systems 2023-02-20 13:02:24 +01:00
Pablo Aragon 4ee6cf7e28 9662-Fix login meta 2023-02-20 09:54:48 +01:00
Pablo Aragon 46a4ee9af2 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-17 12:53:12 +01:00
Pablo Aragon a065f4578c 9662-Login 2023-02-17 12:52:13 +01:00
Jose Gonzalez 1520b8c62f Menu improvements 2023-02-16 14:37:30 +01:00
Jose Gonzalez 4a535b14a2 Fully integrated principal action-buttons 2023-02-15 13:43:42 +01:00
Pablo Aragon 87c3bee756 9666-New widget Event cardboard 2023-02-15 11:23:36 +01:00
Daniel Maya b8de74837e #9662 Added menu images 2023-02-13 17:42:37 +01:00
Jose Gonzalez d45a631ea5 Final merge with new menu 2023-02-13 10:37:37 +01:00
Daniel Maya 44bee67f36 #9663 menu redesing 6 2023-02-13 09:31:33 +01:00
Daniel Maya be3c7bca6c resolved conflict 2023-02-10 11:55:45 +01:00
Pablo Aragon b439ed684e 9859-Widget AvgSumMaxMinModule 2023-02-10 10:31:41 +01:00
Jose Gonzalez 175d4b7341 Fixes in Event view and other fixes 2023-02-09 16:13:30 +01:00
Pablo Aragon 971fc84a47 9680-Create widget ModulesByStatus 2023-02-09 10:12:59 +01:00
Jose Gonzalez e99ad97e17 Fixes and improvements 2023-02-07 15:33:29 +01:00
Pablo Aragon 6d85b912e2 9962-Omnishell in agent view 2023-02-06 16:34:40 +01:00
Jose Gonzalez 0363a90e1f Resolve merge issues 2023-01-31 17:35:44 +01:00
Jose Gonzalez 17c0e78d06 Improve TreeView 2023-01-26 13:25:24 +01:00
Daniel Cebrian 593673c85d #10138 added background image 2023-01-25 08:50:44 +01:00
Daniel Cebrian bbd41a6cfb #10138 changed url images 2023-01-19 09:19:25 +01:00
Jose Gonzalez a9c4dd625c Merge develop branch 2023-01-11 13:46:15 +01:00
Jose Gonzalez 60685cdccc Table fixes 2023-01-10 10:18:37 +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
Pablo Aragon ab54a26815 9868 Remove footer and create About section 2022-12-29 16:21:36 +01:00
Jose Gonzalez ffa4ec756c Agent Group icons adding 2022-12-20 17:22:35 +01:00
Daniel Barbero 105109f0fb add icon datamatrix widget pandora_enterprise#8619 2022-12-19 09:37:01 +01:00
jose.gonzalez@pandorafms.com 2b896bcd17 Minor fixes over module data tables 2022-12-16 12:55:56 +01:00
jose.gonzalez@pandorafms.com d43ae677a3 Changed icons and minor fixes 2022-12-15 12:41:38 +01:00
jose.gonzalez@pandorafms.com 6c5f531bc4 Added images 2022-12-14 09:09:11 +01:00
jose.gonzalez@pandorafms.com 1cfdf881bb Images 2022-11-30 10:30:36 +01:00
jose.gonzalez@pandorafms.com dccd950e9e Changes 2022-11-30 10:14:42 +01:00
Daniel Maya ac910412a3 #9663 WIP menu redesing 2022-11-24 09:36:18 +01:00
jose.gonzalez@pandorafms.com a688182062 Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones 2022-11-22 17:47:02 +01:00
jose.gonzalez@pandorafms.com 197aced536 Inputs update and several style improvements 2022-11-10 15:06:39 +01:00
jose.gonzalez@pandorafms.com f543f73c2c Minor fixes and added new icons 2022-11-07 14:03:34 +01:00
jose.gonzalez@pandorafms.com 6a21fcd6a9 SVG files 2022-10-21 13:33:49 +02:00
Daniel Barbero 370852066f Merge remote-tracking branch 'origin/develop' into ent-8620-copiando-a-grafana-3-grouped-meter-graphs-como-widget-en-dashboard
Conflicts:
	pandora_console/include/functions_modules.php
2022-10-14 11:46:20 +02:00
Daniel Barbero ab59537d42 new widget grouped meter graphs pandora_enterprise#8620 2022-10-10 13:29:40 +02:00
Daniel Maya c58cf09d62 #9252 Added images of spain, europe and world 2022-09-26 12:45:35 +02:00
Daniel Barbero Martin 033027f360 modal sound events pandora_enterprise#9095 2022-07-04 17:09:30 +02:00
Daniel Barbero Martin 2dc16a2a19 modal sound events pandora_enterprise#9095 2022-07-01 13:08:39 +02:00
Daniel Barbero Martin b82ea58efd new icons widgets dashboards pandora_enterprise#8621 2022-06-27 16:00:36 +02:00
Daniel Barbero Martin f1ac9cefd8 new icons widgets dashboards pandora_enterprise#8621 2022-06-27 09:47:33 +02:00
Daniel Barbero Martin a5e845e98f new icons widgets dashboards pandora_enterprise#8621 2022-06-27 09:45:21 +02:00
Daniel Barbero Martin 24305b40b0 Merge remote-tracking branch 'origin/develop' into ent-8621-copiando-a-grafana-4-color-tabs-como-widget-en-dashboard
Conflicts:
	pandora_console/include/javascript/pandora.js
	pandora_console/include/lib/Dashboard/Widget.php
	pandora_console/include/styles/dashboards.css
2022-06-27 08:38:50 +02:00
Daniel Rodriguez 7af375567d Merge branch 'ent-9197-Problema-cabecera-menu' into 'develop'
Change collapsed filename

See merge request artica/pandorafms!4977
2022-06-23 12:29:26 +00:00
José González 82480fa503 Updated logo 2022-06-22 16:46:24 +02:00
José González 5e09b99504 Change collapsed filename 2022-06-22 16:00:04 +02:00
Daniel Barbero Martin 962f223670 new images update manager online pandora_enterprise#9192 2022-06-22 12:21:51 +02:00
José González dc599d2fe6 Handle header image with community and with black theme 2022-06-13 16:23:37 +02:00
José González ad00594b1d Set new brand and color for header 2022-06-07 17:21:13 +02:00
Daniel Barbero Martin 9d2c179423 add new widget color tabs module pandora_enterprise#8621 2022-05-19 18:00:49 +02:00
Daniel Maya 4699ec7a3f #8928 Added img 2022-05-10 13:44:10 +02:00
Daniel Barbero Martin 502b5ab0db add new report custom render pandora_enterprise#8540 2022-04-04 14:40:20 +02:00
Daniel Barbero Martin 4f46da6633 Merge remote-tracking branch 'origin/develop' into ent-8222-Nueva-grafica-desde-la-vista-de-modulos-Histograma
Conflicts:
	pandora_console/include/styles/pandora.css
2022-01-18 10:17:19 +01:00
Daniel Barbero Martin f705cc0fba wip chart histogram list modules #8222 2021-12-14 13:21:34 +01:00
fbsanchez f852df2f1c Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2
Conflicts:
	pandora_console/extras/mr/51.sql
2021-12-14 11:03:04 +01:00
fbsanchez 5c25fa8406 mr updates and a pretty icon 2021-12-09 15:07:35 +01:00
fbsanchez 0cca3a35d5 some icons 2021-11-10 17:14:23 +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
Jose Gonzalez 932d42e8da Fixed colours 2021-11-04 15:44:40 +01:00
marcos 96638189f2 new integriaims logo 2021-10-07 16:46:49 +02:00
Jose Gonzalez 6deaee84ac Merge 2021-10-04 10:00:15 +02:00
Daniel Rodriguez 7904c61df5 Merge branch 'ent-7273-Consola-Visual-nuevo-elemento-Gráfica-básica' into 'develop'
Ent 7273 consola visual nuevo elemento gráfica básica

See merge request artica/pandorafms!4304
2021-10-01 12:48:09 +00:00