Commit Graph

447 Commits

Author SHA1 Message Date
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 Barbero Martin 5328cf21c6 Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-23 12:51:35 +02:00
Daniel Rodriguez 4dd65c20a8 Merge branch 'ent-8888-consolas-visuales-vista-movil-carrefour' into 'develop'
Not orientation CV view mobile pandora_enterprise#8888

See merge request artica/pandorafms!4886
2022-06-23 10:07:24 +00:00
Daniel Barbero Martin b63da2066e Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-23 08:22:31 +02:00
edu.corral 19a26d6835 ent 9181 delete agent with delete pending modules 2022-06-22 10:01:35 +02:00
Daniel Barbero Martin 22717d169d Merge remote-tracking branch 'origin/develop' into ent-8827-cambios-visuales-en-widget-agents-modules
Conflicts:
	pandora_console/include/lib/Dashboard/Widgets/service_map.php
2022-06-21 14:43:47 +02:00
Daniel Barbero Martin c42852a18f refactor events meta pandora_enterprise#9086 2022-06-21 11:20:26 +02:00
Daniel Barbero Martin 9d23b9af4a refactor events meta pandora_enterprise#9086 2022-06-21 11:17:18 +02:00
Daniel Rodriguez 9421cd46f5 Merge branch 'ent-8857-llamada-set-new_agent-api-meta' into 'develop'
Api create agent meta support

See merge request artica/pandorafms!4860
2022-06-21 08:39:22 +00:00
Daniel Barbero Martin 3e59093b0e refactor events meta pandora_enterprise#9086 2022-06-20 12:29:00 +02:00
Daniel Rodriguez a7c61d9ee8 Merge branch 'ent-9139-Widget-Top-N-sale-mal-Continuacion' into 'develop'
Fix

See merge request artica/pandorafms!4956
2022-06-20 08:36:56 +00:00
Calvo 291c6c6a69 Merge remote-tracking branch 'origin/develop' into ent-8857-llamada-set-new_agent-api-meta 2022-06-17 13:27:31 +02:00
Daniel Barbero Martin f3e645146d Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-17 08:51:11 +02:00
Daniel Rodriguez 52cfd6b70a Merge branch 'ent-8899-13499-problema-con-conexion-db-hist-con-contrasenas-con-caracteres-especiales' into 'develop'
Ent 8899 13499 problema con conexion db hist con contrasenas con caracteres especiales

See merge request artica/pandorafms!4852
2022-06-16 09:03:28 +00:00
Daniel Maya bb01bfe2d0 #8899 Fixed history_db_enabled 2 2022-06-16 08:44:09 +02:00
Daniel Barbero Martin 1bf1a83782 Merge remote-tracking branch 'origin/develop' into ent-8888-consolas-visuales-vista-movil-carrefour 2022-06-15 19:49:31 +02:00
José González bb17645c88 Fix 2022-06-10 10:40:28 +02:00
Daniel Barbero Martin 8dbc860f4a refactor events meta pandora_enterprise#9086 2022-06-08 17:01:15 +02:00
Daniel Barbero Martin 951a1703bf Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado
Conflicts:
	pandora_console/include/functions_reporting.php
2022-06-08 08:15:49 +02:00
Daniel Rodriguez bf7941ddd2 Merge branch 'ent-7757-12115-anadir-ruta-completa-en-nombre-de-servicio-en-consola-visual-dashboard' into 'develop'
Service tree view with local scope parents

See merge request artica/pandorafms!4826
2022-06-07 10:47:26 +00:00
Daniel Maya d6fc15f0bf #8763 Added filter groups 2022-06-06 11:14:09 +02:00
Daniel Barbero Martin 459df79c8b Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-06 08:16:25 +02:00
alejandro.campos@artica.es bf2ef75552 fixed permissions 2022-06-03 11:39:58 +02:00
Daniel Rodriguez 1f54d030c7 Merge branch 'ent-8928-Nuevo-widget-OS-Quick-Report' into 'develop'
Ent 8928 nuevo widget os quick report

See merge request artica/pandorafms!4877
2022-06-03 08:12:50 +00:00
Daniel Barbero Martin 1cd680a971 Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado
Conflicts:
	pandora_console/operation/events/events.php
2022-06-03 09:28:18 +02:00
Daniel Rodriguez 0a51c5f916 Merge branch 'ent-8587-nueva-representacion-de-servicios-sunburst' into 'develop'
Ent 8587 nueva representacion de servicios sunburst

See merge request artica/pandorafms!4819
2022-06-02 07:21:17 +00:00
Daniel Barbero Martin 0cda3d3613 refactor events meta pandora_enterprise#9086 2022-06-01 17:27:44 +02:00
Daniel Barbero Martin 4f27aba72c new widget block histogram pandora_enterprise#8618 2022-05-25 09:06:22 +02:00
Daniel Barbero Martin 87baa25662 Merge remote-tracking branch 'origin/develop' into ent-8621-copiando-a-grafana-4-color-tabs-como-widget-en-dashboard 2022-05-24 09:32:06 +02:00
Daniel Barbero Martin 71fcb4fb9f fix error sql service pandora_enterprise#9018 2022-05-23 17:29:41 +02:00
Daniel Maya c2fe3c5d34 #9009 Fixed icon 2022-05-23 16:03:37 +02:00
Daniel Barbero Martin 31ef3f5375 add new widget color tabs module pandora_enterprise#8621 2022-05-23 12:20:50 +02:00
Daniel Barbero Martin 9d2c179423 add new widget color tabs module pandora_enterprise#8621 2022-05-19 18:00:49 +02:00
Daniel Barbero Martin c437b894a3 fixed modal size configuration widgets pandora_enterprise#8827 2022-05-18 12:55:10 +02:00
Daniel Maya 2c1ac769a4 #8929 Added group recursion 2022-05-18 11:06:15 +02:00
Daniel Maya 4ae2df8ded #8939 comment optimization 2022-05-17 13:42:38 +02:00
Daniel Barbero Martin ececdca0b6 Not orientation CV view mobile pandora_enterprise#8888 2022-05-13 12:54:58 +02:00
José González 200fdf9d9f Resuelto. Merge branch 'develop' into 'ent-8892-Widget-TopN-sale-mal'
# Conflicts:
#   pandora_console/include/lib/Dashboard/Widgets/top_n.php
2022-05-12 08:20:50 +00:00
José González b1c87d6a40 Minor fix for show better only booleans modules 2022-05-11 17:37:57 +02:00
Daniel Maya 644948c1b5 #8928 font size 2022-05-10 14:53:33 +02:00
Daniel Maya 4699ec7a3f #8928 Added img 2022-05-10 13:44:10 +02:00
Daniel Maya 2fb2853cd1 #8928 Added os quick report 2022-05-10 10:01:17 +02:00
Calvo e685cf7294 Api create agent meta support 2022-05-04 18:42:56 +02:00
José González 118b845fa0 Fix issue with equal values 2022-04-29 12:49:01 +02:00
José González 46e39e9f68 Set better visual style for show top-n widgets 2022-04-29 12:36:01 +02:00
Daniel Maya 5e931e851a #8893 Fixed color 2022-04-29 12:07:51 +02:00
fbsanchez 00f594293c hint parents in service selection 2022-04-20 19:20:54 +02:00
Daniel Maya fd7af69a1d #8587 tooltip option 2022-04-13 15:24:31 +02:00
Daniel Maya 9f1be4531b #8587 Added sunburst 2022-04-12 17:24:47 +02:00
Daniel Rodriguez 9da8be71bc Merge branch 'ent-8533-Mostrar-valores-en-elementos-Agents-modules' into 'develop'
Ent 8533 mostrar valores en elementos agents modules

See merge request artica/pandorafms!4764
2022-03-31 14:26:51 +00:00
Daniel Maya 5e37c264c1 #8533 change of default value 2022-03-31 09:38:07 +02:00
Daniel Maya c5d0237c23 #8533 Fixed order 2022-03-30 15:12:53 +02:00
Daniel Rodriguez 74e4461d8a Merge branch 'ent-8697-13244-no-funcionan-acciones-de-eventos-a-traves-de-un-dashboard' into 'develop'
Fix dashboard events responses

See merge request artica/pandorafms!4759
2022-03-30 07:45:07 +00:00
Daniel Maya 26d598529c Fixed margin 2022-03-25 10:53:30 +01:00
Calvo 6ed8851188 Fix event list widget actions on dashboard 2022-03-24 18:52:06 +01:00
Daniel Maya 4c9bdca3f8 #8533 Fixed label 2022-03-24 15:15:08 +01:00
Daniel Maya 98aebc4587 #8533 added show module data (report) 2022-03-23 16:59:15 +01:00
Daniel Barbero Martin 4e444a9d20 Merge remote-tracking branch 'origin/develop' into ent-8677-app-android-consolas-visuales 2022-03-23 16:16:10 +01:00
Daniel Maya ff60967bdf Merge branch 'develop' into ent-8533-Mostrar-valores-en-elementos-Agents-modules 2022-03-23 12:12:52 +01:00
Calvo 174f6dce51 Fix dashboard event list, Removed missing debugger in code 2022-03-22 18:02:53 +01:00
Luis ba6a56b9fc WIP: event dashboard responses 2022-03-21 18:15:58 +01:00
Daniel Barbero Martin 0342f2a908 Merge remote-tracking branch 'origin/develop' into ent-8676-consolas-visuales-en-consola-movil 2022-03-21 09:06:44 +01:00
Daniel Maya c2d60fafa9 #8596 Fixed image-item 2022-03-17 16:37:43 +01:00
Daniel Maya e83d63430c #8533 added show module data 2022-03-17 14:48:01 +01:00
Daniel Barbero Martin 6c4d2f2b31 fixed CV in console mobile metaconsole #8676 2022-03-15 18:12:01 +01:00
Calvo 6dc775649d Fix dashboard events responses 2022-03-14 15:29:40 +01:00
Daniel Barbero Martin 4f67ec2f22 API CV #8677 2022-03-08 14:50:59 +01:00
Calvo 8d293c4777 Merge remote-tracking branch 'origin/develop' into ent-8532-widget-agent-modulos-no-muestra-modulos 2022-02-18 12:26:13 +01:00
Calvo 9d4eda381b Merge remote-tracking branch 'origin/develop' into ent-8532-widget-agent-modulos-no-muestra-modulos 2022-02-15 17:44:34 +01:00
Calvo e2b3cd2dab Visual changes on dashboard agent/modules configuration menu 2022-02-15 17:36:00 +01:00
fbsanchez 1da5534484 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8
Conflicts:
	.gitlab-ci.yml
	pandora_console/pandoradb.sql
2022-02-15 17:32:10 +01:00
Daniel Barbero Martin bc9bb070df fix module name finish % pandora_enterprise#8570 2022-02-14 08:55:14 +01:00
Daniel Barbero Martin 362c1d2a51 fix module name finish % pandora_enterprise#8570 2022-02-11 13:22:35 +01:00
fbsanchez 4d912fbd34 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 2022-02-11 09:55:34 +01:00
Daniel Rodriguez f771e2bf9e Merge branch 'ent-8422-Revision-completa-audit-logs' into 'develop'
Ent 8422 revision completa audit logs

Closes pandora_enterprise#8422

See merge request artica/pandorafms!4669
2022-02-10 14:20:42 +00:00
Luis 611cac2340 Fix plugin registration pspz pspz2 2022-02-08 10:01:17 +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
José González 36bef528ab Merge branch 'develop' into 'ent-8422-Revision-completa-audit-logs'
# Conflicts:
#   pandora_console/godmode/massive/massive_delete_agents.php
2022-02-01 12:45:17 +00:00
Jose Gonzalez 40efaa157d Merge remote-tracking branch 'origin' into ent-8422-Revision-completa-audit-logs 2022-02-01 13:42:30 +01:00
Jose Gonzalez d81e6571ec New audit logs 2022-02-01 13:39:18 +01:00
fbsanchez e157b1102f Pandora WebSockets fix 2022-01-27 23:18:12 +01:00
fbsanchez b0824e048e some changes 2022-01-26 18:40:45 +01:00
Daniel Barbero Martin 9f01029520 Merge remote-tracking branch 'origin/develop' into ent-8290-Crear-nueva-seccion-Operaciones-Masivas-borrado-agentes-en-Metaconsola 2022-01-26 08:12:20 +01:00
fbsanchez 1207463f16 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8
Conflicts:
	pandora_console/include/class/HTML.class.php
2022-01-25 14:16:47 +01:00
vgilc 4b85e93490 Merge branch 'ent-8222-Nueva-grafica-desde-la-vista-de-modulos-Histograma' into 'develop'
Ent 8222 nueva grafica desde la vista de modulos histograma

See merge request artica/pandorafms!4637
2022-01-25 10:28:18 +00:00
vgilc b547278930 Merge branch 'ent-7988-no-se-puede-cambiar-la-skin-de-pandora-en-entorno-meta-nodo-sincronizados' into 'develop'
Ent 7988 no se puede cambiar la skin de pandora en entorno meta nodo sincronizados

See merge request artica/pandorafms!4633
2022-01-25 10:27:25 +00:00
Daniel Barbero Martin 9a799a838d Merge remote-tracking branch 'origin/develop' into ent-8290-Crear-nueva-seccion-Operaciones-Masivas-borrado-agentes-en-Metaconsola 2022-01-25 10:34:43 +01:00
Daniel Barbero Martin 83970932ce bulk operations agents in meta #8290 2022-01-24 16:57:42 +01:00
fbsanchez 35184c4eb6 ws php8 2022-01-21 17:39:11 +01:00
Jose Gonzalez 3252832cc7 WIP: Check audit logs 2022-01-20 10:55:23 +01: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 Maya e8d3d93f7f Fixed pandora_black in metaconsole 2022-01-17 10:22:30 +01:00
Jose Gonzalez f1fd4926a7 Merge branch 'ent-8409-bug-widget-agent-module-view' of brutus.artica.es:artica/pandorafms into ent-8409-bug-widget-agent-module-view 2022-01-13 13:15:39 +01:00
fbsanchez 32c0229966 php8 review 2022-01-13 12:43:55 +01:00
Jose Gonzalez 3596ee35df Perform correct visualization of information tiles 2022-01-13 12:30:04 +01:00
José González f18e0693da Merge branch 'develop' into 'ent-8409-bug-widget-agent-module-view'
# Resolve Conflicts:
#   pandora_console/include/javascript/pandora_dashboards.js
2022-01-13 08:58:21 +00:00
Daniel Maya ffc468fce8 Added message 2022-01-12 13:59:46 +01:00
Jose Gonzalez 70d8c5177a Fix issues in node 2022-01-12 13:50:27 +01:00
Daniel Rodriguez 8e9c3184a8 Merge branch 'ent-8186-Bug-en-widget-General-visual-maps-report-Dashboard-metaconsola' into 'develop'
Ent 8186 bug en widget general visual maps report dashboard metaconsola

See merge request artica/pandorafms!4626
2022-01-12 09:45:59 +00:00
Jose Gonzalez 9519e00992 Fix issues with select agents modules control 2022-01-11 16:06:58 +01:00
Daniel Maya 191f17b7d6 Fixed url in metaconsole 2022-01-11 15:40:49 +01:00
fbsanchez 3b6f5bd02f services php8 2022-01-11 14:30:59 +01:00
Jose Gonzalez 4ce90a70eb Fixed visual issue 2022-01-10 10:22:59 +01:00
Jose Gonzalez 4f52e1192c Fixed missing code 2022-01-07 12:22:15 +01:00
Calvo f9dceb9e10 Fix not init color 2021-12-28 12:38:22 +01:00
Daniel Rodriguez f8b90c21ed Merge branch 'ent-8180-Bug-en-widget-Network-map-Dashboard-metaconsola' into 'develop'
Ent 8180 bug en widget network map dashboard metaconsola

See merge request artica/pandorafms!4573
2021-12-23 10:02:24 +00: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 e37cdc4459 Improvements in Entity class 2021-12-09 14:57:37 +01:00
Daniel Maya 765a36f913 #8180 Fix map select in metaconsole 2021-12-07 15:48:49 +01:00
fbsanchez 19643cd685 report for ncm simple 2021-11-29 15:26:19 +01:00
fbsanchez a9485024f4 Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2
Conflicts:
	pandora_console/extras/mr/51.sql
2021-11-23 14:29:23 +01:00
Daniel Rodriguez 3efcc8d30f Merge branch 'ent-8146-Bug-en-filtro-de-eventos-de-widget-List-of-latest-events-Dashboard' into 'develop'
Ent 8146 bug en filtro de eventos de widget list of latest events dashboard

See merge request artica/pandorafms!4504
2021-11-22 15:53:16 +00: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
Daniel Barbero Martin c52e11e91a Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales
Conflicts:
	pandora_console/extras/mr/51.sql
2021-11-19 08:12:22 +01:00
fbsanchez cc859f3978 Entity, allow to duplicate objects 2021-11-15 19:29:37 +01:00
Daniel Rodriguez 4eb40382dd Merge branch 'ent-8049-Bug-en-widget-Visual-console-de-Dasboards-metaconsola' into 'develop'
Ent 8049 bug en widget visual console de dasboards metaconsola

See merge request artica/pandorafms!4450
2021-11-15 11:20:21 +00:00
Daniel Rodriguez 650607067e Merge branch 'ent-7688-conteo-monitores-vista-tactica' into 'develop'
Include modules not init in total monitors count on tactical view

See merge request artica/pandorafms!4309
2021-11-15 11:00:07 +00:00
Daniel Barbero Martin bd75912a0d wip special days alerts 2021-11-04 09:55:37 +01:00
Daniel Barbero Martin fdca5e4a78 wip special days alerts 2021-11-03 17:30:54 +01:00
Daniel Barbero Martin 1e976a8605 alerts special days wip 2021-11-03 10:59:00 +01:00
Daniel Barbero Martin 25268ec9b4 color 2021-11-02 17:49:45 +01:00
Daniel Barbero Martin 9d776feb41 dashboard widget tree fix in metaconsole only groups type 2021-10-29 11:50:41 +02:00
Daniel Maya 3b49b28d9e #8146 Fixed max hours 2021-10-27 09:18:28 +02:00
fbsanchez 6781e513c8 NCM WIP 2021-10-06 19:52:46 +02:00
Daniel Maya eab82aa6d1 #8049 Fixed get visual console with selected node 2021-10-06 16:49:21 +02:00
fbsanchez dae8a9ba14 Merge remote-tracking branch 'origin/develop' into ent-7060-gestion-basica-de-configuracion-de-equipos-de-red 2021-10-06 14:50:13 +02:00
Daniel Rodriguez 3f86528c80 Merge branch 'ent-7910-pandora-db-con-db-encriptada' into 'develop'
Fix issue with encrypted password

Closes pandora_enterprise#7910

See merge request artica/pandorafms!4433
2021-10-06 12:42:12 +00:00
fbsanchez e11d8f3766 minor schema update 2021-10-04 19:43:57 +02:00
fbsanchez 9dff230b65 Allow enable or disable cache in Entity and some minor fixes 2021-09-30 12:23:37 +02:00
Jose Gonzalez d68328c777 Fix issue with encrypted password 2021-09-28 16:39:22 +02:00
Daniel Rodriguez ddd550ce42 Merge branch 'ent-8022-12445-duplicacion-de-politicas-con-mergeador-de-metaconsola' into 'develop'
Entity dynamic method calling improved

See merge request artica/pandorafms!4415
2021-09-28 12:56:00 +00:00
Daniel Rodriguez 49961ed261 Merge branch 'ent-6296-10650-Añadir-widget-de-lista-de-servicios' into 'develop'
Ent 6296 10650 añadir widget de lista de servicios

See merge request artica/pandorafms!4355
2021-09-24 09:09:28 +00:00
Jose Gonzalez 7bfe699802 Fixes minor issues 2021-09-23 17:01:22 +02:00
Daniel Maya 3f91fda888 Fixed module_details_window 2021-09-23 10:59:24 +02:00
Jose Gonzalez 5b40a4f700 Merge remote-tracking branch 'origin' into ent-7514-pasar-networkmaps-a-open 2021-09-23 08:50:50 +02:00
Daniel Rodriguez f78d2e8a4b Merge branch 'ent-7697-varios-bugs-visuales-en-modal-de-configuracion-de-widget-metaconsola' into 'develop'
Fix widgets style bugs

See merge request artica/pandorafms!4272
2021-09-22 08:58:51 +00:00
fbsanchez 47633b4794 A better explanation 2021-09-16 21:57:23 +02:00
fbsanchez 187c6700b1 Simplified Entity 2021-09-16 21:54:12 +02:00
fbsanchez b33be80be3 Entity dynamic method calling improved 2021-09-16 21:16:49 +02:00
Jose Gonzalez a774d67f2a Merge remote-tracking branch 'origin' into ent-7514-pasar-networkmaps-a-open 2021-09-10 12:50:23 +02:00
Daniel Rodriguez 3f5d37493e Merge branch 'ent-7955-500-en-link-al-agente-desde-widget-list-of-latest-events-dashboard-metaconsola' into 'develop'
fixed error with node link events list dashboard

See merge request artica/pandorafms!4382
2021-09-03 09:44:49 +00:00
marcos 8b048c8c19 fixed error with node link events list dashboard 2021-09-02 16:43:16 +02:00
marcos f49d6d3088 fixed error with node link events list dashboard 2021-09-01 16:54:07 +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
Daniel Rodriguez f53969731a Merge branch 'ent-7638-11735-vista-de-eventos-en-dashboard-menus-descolocados' into 'develop'
fixed error with wrong event list dialog in dashboard

See merge request artica/pandorafms!4374
2021-08-31 10:03:30 +00:00
marcos 05de5f643f fixed error with wrong event list dialog in dashboard 2021-08-27 09:20:30 +02:00
marcos 2ed657c166 updates 2021-08-26 12:42:16 +02:00
marcos 4d270a3559 set first option select2 all to none if not condition is enabled 2021-08-23 09:52:42 +02:00
José González 2f0681c29b Fix issues with string values 2021-08-20 14:11:03 +02:00