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

544 Commits

Author SHA1 Message Date
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
Daniel Maya 0fd076810d Added services view widget 2 2021-08-17 13:32:54 +02:00
Daniel Maya d70752baa1 Added services view widget 2021-08-13 14:12:21 +02:00
fbsanchez 4595b1ec11 Retro-compability 2021-08-11 14:02:56 +02:00
fbsanchez cf976f9622 Merge remote-tracking branch 'origin/develop' into ent-7861-fallo-umc-cuando-hay-db-historico 
Conflicts:
	pandora_console/godmode/um_client/index.php
 2021-08-11 09:56:02 +02:00
Daniel Rodriguez 3e1208d5b2 Merge branch 'ent-7443-Metaconsola-Nodo-Dashboard-Top-N-events-de-todos-ninguno-saca-informacion' into 'develop' 
fixed top n widgets in meta

See merge request artica/pandorafms!4255
 2021-08-10 12:22:46 +00:00
Daniel Rodriguez a936deb255 Merge branch 'ent-7489-11802-iconos-desfasados-en-dashboard' into 'develop' 
fixed error with name on agent module view

See merge request artica/pandorafms!4257
 2021-08-10 12:20:39 +00:00
Daniel Rodriguez 604ef4bc89 Merge branch 'ent-7442-Metaconsole-Dashboard-WUX-Transaction-Stats-no-encuentra-trans' into 'develop' 
Ent 7442 metaconsole dashboard wux transaction stats no encuentra trans

Closes pandora_enterprise#7442

See merge request artica/pandorafms!4295
 2021-08-06 12:53:06 +00:00
Daniel Rodriguez 25e8c2a850 Merge branch 'ent-7668-12023-Fallo-tags-en-filtro-de-vista-de-ultimos-eventos-de-Dashboard' into 'develop' 
Ent 7668 12023 fallo tags en filtro de vista de ultimos eventos de dashboard

See merge request artica/pandorafms!4226
 2021-08-03 06:51:23 +00:00
fbsanchez 41f2842e41 Proxy fix and some traceability for DBH upgrade 2021-07-29 13:11:45 +02:00
José González 6c9da79fac WIP: Backup upload 2021-07-28 14:23:02 +02:00
Calvo a8c0ba8e78 Include modules not init in total monitors count on tactical view 2021-07-19 13:20:00 +02:00
José González 9695d62424 Fix 2021-07-13 18:18:36 +02:00
José González d3e815ce43 Fixed WUX widgets in meta 2021-07-12 12:32:05 +02:00
Calvo cdf6c3972e Fix widgets style bugs 2021-07-07 12:09:47 +02:00
marcos 4100d541cf fixed error with name on agent module view 2021-07-01 17:28:12 +02:00
alejandro.campos@artica.es a88a131152 fixed top n widgets in meta 2021-07-01 15:07:52 +02:00
fbsanchez b3d88e6f6e Some general fixes, deprecated rrdir (use Files::rmrf) 2021-07-01 00:37:13 +02:00
fbsanchez f8aeb57582 add method to test existing and at first look valid zip file 2021-06-29 20:03:00 +02:00
fbsanchez 760522aeff Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-28 11:03:09 +02:00
fbsanchez 36e455e5c5 Fixes for agent_module widget 2021-06-23 18:00:54 +02:00
fbsanchez de03486134 Merge remote-tracking branch 'origin/develop' into ent-6661-giss-agregar-elementos-en-servicios 2021-06-23 09:48:01 +02:00
fbsanchez b88609ca2e Improve error messages while saving a new Agent entity 2021-06-22 20:25:05 +02:00
Daniel Maya 289e8a3902 #7668 fixed tags 2021-06-22 17:05:45 +02:00
fbsanchez 390bf14761 cover for bulk service operations in mc/node 2021-06-22 15:32:15 +02:00
fbsanchez faa9fee273 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_agents/unix/Darwin/dmg/resources/text/conclusion.html
	pandora_agents/unix/Darwin/dmg/resources/text/license.html
	pandora_console/extras/delete_files/delete_files.txt
	pandora_console/extras/mr/48.sql
 2021-06-21 17:33:45 +02:00
Daniel Rodriguez f134377b37 Merge branch 'ent-7547-Tree-view-no-filtra-bien-Dashboard' into 'develop' 
Ent 7547 tree view no filtra bien dashboard

See merge request artica/pandorafms!4136
 2021-06-21 14:01:32 +00:00
Daniel Maya 878a5321e8 Ent 7547 tree view no filtra bien dashboard 2021-06-21 14:01:32 +00: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
Daniel Rodriguez 95a152752b Merge branch 'ent-7555-11820-Filtro-de-eventos-en-widget-Lastest-events' into 'develop' 
Ent 7555 11820 filtro de eventos en widget lastest events

See merge request artica/pandorafms!4142
 2021-06-21 09:10:45 +00:00
fbsanchez 1f34cf8596 Massive operation over service elements 2021-06-18 15:36:52 +02:00
fbsanchez b701b2be32 Plugin sync 2021-06-16 15:53:05 +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 4db0f75763 Refresh & delete collections Async - synchronization 2021-06-14 14:54:07 +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
fbsanchez 9c314bcd39 Files reviewed & tested 2021-06-11 13:04:06 +02:00
fbsanchez 085e0ba300 Added Files class to handle zip/unzip/rmrf and more 2021-06-11 10:48:58 +02:00
Daniel Barbero Martin ea90a61b06 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-02 18:27:15 +02:00
fbsanchez f003c37b09 Changes in disabled method - Module class 2021-06-02 10:05:31 +02:00
fbsanchez 70b8eb77a3 Remove service elements when removing items itselves and multiple fixes 2021-06-01 12:12:07 +02:00
fbsanchez a98a72354b Controlled unhandled exceptions in index and some fixes in Module class while item is being deleted 2021-06-01 10:04:53 +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
José González e69f258f8a Fixed issue with webserver modules 2021-05-25 12:50:25 +02: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 Maya 9559a63c3b #7555 fixed module_search with filter 2021-05-19 17:11:41 +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
fbsanchez 3bb615a639 Added method getDBH DBmaintainer 2021-05-10 15:24:33 +02:00
fbsanchez 9d8079ad77 minor method Group 2021-04-21 10:26:33 +02:00
fbsanchez 37e3f68b18 minor fix 2021-04-20 14:08:27 +02:00
fbsanchez 36df48c621 Some improvements in Group class 2021-04-20 11:09:07 +02:00
Daniel Rodriguez 59ec6c850d Merge branch 'ent-6387-limitar-agentes-por-grupo' into 'develop' 
Added control for max agents in groups

Closes pandora_enterprise#6387

See merge request artica/pandorafms!3800
 2021-04-19 07:17:56 +00:00
Jose Gonzalez a6936f16d5 Cleaned event create control for centralized management 2021-04-15 15:50:10 +02:00
Jose Gonzalez ff177c544d Modified and adapted Event class 2021-04-15 12:00:00 +02:00
marcos 48cc1283cc add black theme to widget dashboard 2021-04-14 15:09:19 +02:00
marcos b6ea565118 add black theme to widget dashboard 2021-04-14 12:07:38 +02:00
fbsanchez 5143bbdfdb networkmaps in dashboards MC 2021-04-06 16:47:32 +02:00
fbsanchez 1c94f619ef Custom graphs in widget in MC 2021-04-06 14:20:07 +02:00
fbsanchez 55e272c360 MC dashboards agent_module fixes 2021-04-06 12:53:12 +02:00
fbsanchez 700817acaf Merge branch 'develop' into 'ent-2685-7938-aadcm-dashboards-en-metaconsola' 
Conflicts:
   pandora_console/include/functions_html.php
 2021-03-31 10:12:36 +00:00
Daniel Rodriguez 04483fe9f3 Merge branch 'ent-7210-Bug-en-token-limit-de-widget-List-of-last-events' into 'develop' 
fixed minor error

See merge request artica/pandorafms!3958
 2021-03-29 07:15:32 +00:00
Daniel Rodriguez 316aa0a691 Merge branch 'ent-7222-Bug-en-widget-Defined-custom-graph' into 'develop' 
fixed minor error

See merge request artica/pandorafms!3960
 2021-03-26 11:39:14 +00:00
Daniel Barbero Martin 021675d825 fixed minor error 2021-03-26 11:28:34 +01:00
Daniel Barbero Martin 193d6bf2d2 fixed minor error 2021-03-26 10:37:44 +01:00
Daniel Barbero Martin 8e57e1645c fixed minor error 2021-03-26 10:34:07 +01:00
Daniel Rodriguez 6413f6d551 Merge branch 'ent-4755-base-de-datos-historico-revision' into 'develop' 
DBMainainer, fixed Websockets library placement

See merge request artica/pandorafms!3797
 2021-03-25 14:33:31 +00:00
fbsanchez 7b7ef3a757 minor improvement (err. messages) 2021-03-25 14:25:09 +01:00
fbsanchez 12767683dc minor fixes 2021-03-24 16:25:27 +01:00
fbsanchez ac1c3398fe Merge remote-tracking branch 'origin/develop' into ent-2561-llamadas-api-para-modulos-de-politicas 2021-03-24 16:05:08 +01:00
fbsanchez d312f764ed Hack to use old functions from PandoraDB 2021-03-24 13:43:14 +01:00
fbsanchez 0179e89740 Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 2021-03-24 13:16:54 +01:00
Daniel Rodriguez ce2f4ec7cc Merge branch 'ent-7112-bugs-consola-visual-y-dashboards' into 'develop' 
Command center

See merge request artica/pandorafms!3887
 2021-03-24 11:43:52 +00:00
daniel 774fc9ebe5 Command center 2021-03-24 11:43:51 +00:00
fbsanchez c3232b0f2a Merge remote-tracking branch 'origin/develop' into ent-7010-nexcon-mejoras-widget-de-eventos 
Conflicts:
	pandora_console/include/class/ConsoleSupervisor.php
 2021-03-24 09:55:31 +01:00
Daniel Rodriguez a7b19bd347 Merge branch 'ent-6865-uniway-funcionalidad-password-en-grupos-no-compatible-con-discovery-plugins-xml' into 'develop' 
Ent 6865 uniway funcionalidad password en grupos no compatible con discovery plugins xml

See merge request artica/pandorafms!3761
 2021-03-22 12:39:59 +00:00
fbsanchez e0aa1bfc68 Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
	pandora_console/include/styles/pandora.css
 2021-03-22 09:59:07 +01:00
Marcos Alconada d8a628b1c4 Ent 6781 revision de estilos visuales y eliminacion de sistemas skins 2021-03-11 14:40:23 +00:00
fbsanchez 6df9870f92 Merge remote-tracking branch 'origin/develop' into ent-2561-llamadas-api-para-modulos-de-politicas 
Conflicts:
	pandora_console/include/functions_api.php
	visual_console_client/src/Item.ts
 2021-03-11 14:37:06 +01:00
fbsanchez 95f1a2abcc Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
 2021-03-11 10:00:17 +01:00
daniel 6db07e5fe0 fixed errors CV dashboards 2021-03-03 12:42:02 +00:00
fbsanchez d96590aea5 Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 
Conflicts:
	pandora_console/include/functions_ui.php
	pandora_console/include/styles/pandora.css
 2021-03-02 09:40:15 +01:00
Daniel Rodriguez 4fbfc14479 Merge branch 'ent-6817-Meter-spinning-Loading-en-la-visualizacion-de-graficas-de-modulos' into 'develop' 
Fix loading charts modules and interfaces

See merge request artica/pandorafms!3700
 2021-03-01 12:16:27 +00:00
Luis eb5e295286 Ent 7080 error servicios elementos modulo 2021-02-25 17:56:21 +00:00
fbsanchez 9f694e32f7 Merge remote-tracking branch 'origin/develop' into ent-2561-llamadas-api-para-modulos-de-politicas 
Conflicts:
	pandora_console/godmode/wizards/Wizard.main.php
 2021-02-24 09:41:53 +01:00
fbsanchez 85f37a91de Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 
Conflicts:
	pandora_console/include/functions_ui.php
 2021-02-22 12:01:29 +01:00
fbsanchez bdea068f89 Dashboards in metaconsole 2021-02-18 13:20:54 +01:00
fbsanchez ef16ef4281 Dashboards in metaconsole 2021-02-18 12:47:42 +01:00
fbsanchez 1b3eb9a19e Merge remote-tracking branch 'origin/ent-7010-nexcon-mejoras-widget-de-eventos' into ent-2685-7938-aadcm-dashboards-en-metaconsola 
Changes from #7010 into #2685
 2021-02-17 16:48:40 +01:00
fbsanchez 673f95e276 Dashboards in meta 2021-02-17 12:57:13 +01:00
fbsanchez da7e903101 WIP dashboards meta 2021-02-17 12:19:22 +01:00
fbsanchez 20dc58a140 Improved event widget, added custom filters 2021-02-10 18:41:53 +01:00
fbsanchez 0be3e0ab90 Event widget and some notices fixed 2021-02-10 15:00:23 +01:00
fbsanchez 600b914715 Some improvements in multi-server communications (Entity) 2021-02-03 14:21:59 +01:00
fbsanchez 93908626a0 Merge remote-tracking branch 'origin/develop' into ent-6665-axa-datos-heredados-en-evento-alert-fired 2021-02-03 13:32:54 +01:00
fbsanchez 380c77be02 Merge remote-tracking branch 'origin/develop' into ent-6384-consola-visual-nuevo-elemento-interfaz-de-red 
Conflicts:
	pandora_console/include/lib/Module.php
	pandora_console/include/visual-console-client/vc.main.css.map
 2021-02-02 12:15:24 +01:00
fbsanchez 712079c30e RC1 #4755 2021-02-01 15:00:54 +01:00
fbsanchez 96c218f21e Some updates and minor fixes DBMaintainer 2021-02-01 13:31:42 +01:00
fbsanchez 04be237b7a minor method added 2021-01-29 14:30:16 +01:00
fbsanchez dbc48852aa Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
 2021-01-28 16:12:47 +01:00
fbsanchez 9fc3856f83 WIP historical database automaintenance + minor fixes 2021-01-28 13:20:36 +01:00
fbsanchez dd4849f7c3 WIP Scheduled install & update of history database processes 2021-01-27 19:23:31 +01:00
fbsanchez 25b15182e3 DBH auto-updater 2021-01-27 15:48:00 +01:00
fbsanchez d24bcd700d Merge remote-tracking branch 'origin/develop' into ent-6158-mejoras-a-servicios-dinamicos-expresiones-regulares-y-varios-custom-field 2021-01-27 14:08:41 +01:00
fbsanchez bbab6d9fe1 WIP update process 2021-01-27 14:06:22 +01:00
fbsanchez c7706a6bfa WIP Historical database manager (setup) 2021-01-27 12:35:37 +01:00
fbsanchez 192a635599 WIP setup.hdb 2021-01-25 19:29:22 +01:00
fbsanchez d9428ce215 WIP DBMainainer, fixed Websockets library placement 2021-01-25 13:33:02 +01:00
Daniel Rodriguez e88ca95a8d Merge branch 'ent-6631-Bug-en-dashboard-de-usuario-sin-permiso' into 'develop' 
Ent 6631 bug en dashboard de usuario sin permiso

See merge request artica/pandorafms!3781
 2021-01-25 10:07:53 +01:00
alejandro-campos 983d58260d changes in dashboard permissions 2021-01-21 14:42:43 +01:00
fbsanchez 012ad2fb55 Merge remote-tracking branch 'origin/develop' into ent-2561-llamadas-api-para-modulos-de-politicas 2021-01-21 10:47:49 +01:00
fbsanchez 16029f7faf Significant fixes 2021-01-20 20:08:34 +01:00
fbsanchez 6ea19ac5fa External changes from #6158 2021-01-19 18:00:28 +01:00
alejandro-campos 535486a429 Merge branch 'develop' into ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-3 2021-01-18 11:48:51 +01:00
Alejandro Campos 5b9d7bcb81 Merge branch 'develop' into 'ent-6631-Bug-en-dashboard-de-usuario-sin-permiso-2' 
# Conflicts:
#   pandora_console/include/lib/Dashboard/Widgets/agent_module.php
 2021-01-15 14:52:26 +01:00
alejandro-campos 05c39db0cc changes in dashboard permissions 2021-01-15 13:57:25 +01:00
alejandro-campos a0931d7ada changes in dashboard permissions 2021-01-15 13:52:31 +01:00
Daniel Rodriguez fc9eb947c8 Merge branch 'ent-6355-Cambio-de-mensaje-de-Widget-dashboard-sin-permisos' into 'develop' 
fix remove acl widget agent/module

See merge request artica/pandorafms!3637
 2021-01-14 14:46:52 +01:00
alejandro-campos 366d02f203 Merge remote-tracking branch 'origin/ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-2' into ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-3 2021-01-14 09:22:06 +01:00
fbsanchez 96a8dbd0c8 added name method alias of nombre to Group class 2021-01-07 18:25:59 +01:00
fbsanchez 32d09a2353 added name method alias of nombre to Group class 2021-01-07 18:24:51 +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
Daniel Rodriguez 4b0fb7e762 Merge branch 'ent-6404-Bug-en-widget-Consolas-visuales-en-dashboard' into 'develop' 
fix dashboard VC

See merge request artica/pandorafms!3650
 2020-12-22 16:05:21 +01:00
Daniel Rodriguez efb4dabd18 Merge branch 'ent-6632-Bug-dashboard-favorito-cuando-no-lo-es' into 'develop' 
fixed query

See merge request artica/pandorafms!3602
 2020-12-21 12:02:47 +01:00
José González 623b729001 Merge branch 'develop' into 'ent-1175-copyright-actualizados' 
# Conflicts:
#   pandora_agents/pc/Win32/pandora_agent.conf
#   pandora_agents/win32/bin/pandora_agent.conf
#   pandora_console/extensions/realtime_graphs.php
#   pandora_console/godmode/snmpconsole/snmp_alert.php
#   pandora_console/include/functions_ui.php
#   pandora_console/install.php
#   pandora_console/operation/agentes/realtime_win.php
 2020-12-14 11:10:35 +01:00
fbsanchez 6461f029ee Added macros to event response 2020-12-10 17:53:49 +01:00
Daniel Barbero Martin aa52ab01df Fix loading charts modules and interfaces 2020-12-09 14:05:40 +01:00
Daniel Rodriguez 64509df179 Merge branch 'ent-6536-servicios-item-tipo-agente-desconocido-en-mapa-de-servicio' into 'develop' 
Ent 6536 servicios item tipo agente desconocido en mapa de servicio

See merge request artica/pandorafms!3574
 2020-11-30 14:29:43 +01:00
Jose Gonzalez 649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
Daniel Barbero Martin 2e950af548 fix dashboard VC 2020-11-25 11:33:36 +01:00
fbsanchez e9fb346ecd Definition matching Entity 2020-11-24 18:10:39 +01:00
Daniel Barbero Martin 1ad1671612 fix remove acl widget agent/module 2020-11-23 09:29:11 +01:00
fbsanchez 4e73d8045a Minor fixes 2020-11-17 11:07:59 +01:00
fbsanchez 916537ea11 Net Interfaces methods in Agent/Module updates in NetworkLink 2020-11-13 16:07:59 +01:00
alejandro-campos c6cf4ab9ee fixed query 2020-11-11 16:25:58 +01:00
fbsanchez d85c1ace3c WIP network links VC 2020-11-03 16:35:11 +01:00
fbsanchez 1c14fa4bcb Added -force- option to Agent::lastStatus 2020-10-26 17:12:55 +01:00
fbsanchez 633116a793 Added -force- option to Agent::lastStatus 2020-10-26 17:12:27 +01:00
alejandro-campos def59508ae changed behavior of all group acl check and fixed acl vulnerabilities 2020-10-22 12:00:44 +02:00
fbsanchez 25295f7b0b fixes 2020-10-20 18:06:05 +02:00
Daniel Rodriguez 5ad265cbc8 Merge branch 'ent-6456-error-critico-operaciones-masivas-grupo-0' into 'develop' 
Fix unhandled extra-options in group selector inclusions

See merge request artica/pandorafms!3518
 2020-10-09 10:23:18 +02:00
fbsanchez a4b2e38ffc Fix unhandled extra-options in group selector inclusions 2020-10-08 16:41:26 +02:00
fbsanchez ff8aaf18fe Group event reports (with secondary groups) 2020-10-06 15:48:12 +02:00
fbsanchez 95f58776c8 fixes group selection 2020-09-30 17:47:44 +02:00
fbsanchez 5f4893ef1a Merge remote-tracking branch 'origin/develop' into ent-5822-prueba-concepto-modal-selector-de-grupos 2020-09-29 12:47:11 +02:00
fbsanchez 12314d33c3 fixed direct html responses with sl2 2020-09-28 16:02:54 +02:00
fbsanchez 29ac13815a preload env required files (css,js) 2020-09-28 15:56:17 +02:00
Manuel Montes f78ae89a99 Ent 6177 mejoras para el public link de dashboards 2020-09-24 16:20:13 +02:00
Daniel Rodriguez b18bbbf237 Merge branch 'ent-3357-7329-comision-europea-ordenar-consolas-por-nombre-en-metaconsola-y-anadir-buscador' into 'develop' 
mc search nodes

See merge request artica/pandorafms!3463
 2020-09-18 14:37:10 +02:00
Daniel Rodriguez 02d364b66c Merge branch 'ent-6176-10390-Problema-de-permisos-en-los-dashboard' into 'develop' 
added acl checks on dashboard update

See merge request artica/pandorafms!3461
 2020-09-17 16:33:15 +02:00
fbsanchez 79bedb4982 Merge remote-tracking branch 'origin/develop' into ent-3357-7329-comision-europea-ordenar-consolas-por-nombre-en-metaconsola-y-anadir-buscador 2020-09-17 11:51:29 +02:00
fbsanchez 9d40f900ba WIP mc search nodes 2020-09-16 15:54:43 +02:00
alejandro-campos 05a0a3a366 fixed bug 2020-09-16 10:09:23 +02:00
alejandro-campos 5bb50acfb1 added acl checks on dashboard update 2020-09-16 10:00:05 +02:00
fbsanchez da7f286b22 fixed pagination (final page) 2020-09-11 15:09:52 +02:00
fbsanchez 017333c46a fixed pagination (final page) 2020-09-11 15:03:40 +02:00
fbsanchez a72002dc0e fixed pagination (final page) 2020-09-11 14:56:32 +02:00
fbsanchez 426286b8b5 fixed pagination (started by 1 instead 0, select2 requirement) 2020-09-11 14:53:29 +02:00
fbsanchez 3374a89ae0 Group selection improvement 2020-09-11 14:34:41 +02:00
fbsanchez 9d3a209fc8 Merge remote-tracking branch 'origin/develop' into ent-5735-9752-problema-no-inicializados-modulos-de-tipo-log 2020-09-07 09:26:47 +02:00
Daniel Rodriguez c86ec629cd Merge branch 'ent-6054-Dashboard-group-status-mas-de-1-grupo' into 'develop' 
fixed errors in dashboard widget groups status

See merge request artica/pandorafms!3369
 2020-08-07 09:40:12 +02:00
daniel fdad32e4f0 Add public link dashboards 2020-07-22 10:56:16 +02:00
daniel bd1c6b95ec Add agent/module view in dashboard 2020-07-17 10:33:40 +02:00
fbsanchez c8d86a4bdb minor fix 2020-07-15 13:46:51 +02:00
fbsanchez dc5767705f minor fixes 2020-07-13 13:56:41 +02:00
fbsanchez 23641e45bb Entity with enterprise capabilites 2020-07-10 13:38:42 +02:00
Daniel Barbero Martin af87e8c621 fixed errors in dashboard widget groups status 2020-07-10 08:30:57 +02:00
fbsanchez 3d493f14da massive services 2020-07-07 19:10:24 +02:00
fbsanchez 352da65640 WIP Smart services 2020-07-03 17:52:44 +02:00
fbsanchez af7981ed05 Service tree view 2020-07-02 14:53:33 +02:00
fbsanchez ffba7b8285 wip services improvements 2020-06-30 18:59:47 +02:00
fbsanchez faaf14bfd4 Merge remote-tracking branch 'origin/develop' into ent-6012-servicios-dinamicos 
Conflicts:
	pandora_console/extras/mr/39.sql
	pandora_console/include/lib/Module.php
 2020-06-30 17:04:33 +02:00
fbsanchez 1d621bd3d5 WIP services 2020-06-30 16:57:08 +02:00
José González 311b259684 Backup upload 2020-06-30 12:16:51 +02:00
fbsanchez c07daa3199 WIP Services 2020-06-29 19:17:40 +02:00
fbsanchez 032faf8c0c WIP Smart services 2020-06-26 15:48:58 +02:00
fbsanchez a8671078f1 Merge remote-tracking branch 'origin/develop' into ent-6012-servicios-dinamicos 
Conflicts:
	pandora_console/install.php
 2020-06-25 11:25:43 +02:00
fbsanchez 45a161426b Services review 2020-06-24 18:01:34 +02:00
daniel a59cdec545 Fixed error dashboard draw multiple widget services 2020-06-09 10:37:29 +02:00
Daniel Rodriguez 6cf96a0fad Merge branch 'fix-widget-title-corruption' into 'develop' 
Widget title corruption in dashboard with multi-byte characters.

See merge request artica/pandorafms!3190
 2020-06-02 09:55:05 +02:00
fbsanchez e66f33fd37 WIP Cluster references updated 2020-05-22 12:14:01 +02:00
fbsanchez 523212afb8 WIP cluster view 2020-05-20 19:04:42 +02:00
fbsanchez 585f0f011e WIP cluster rebuild 2020-05-14 17:49:02 +02:00
fbsanchez 57ccd783b0 Merge branch 'develop' into 'ent-5756-pantallas-de-configuracion-del-cluster' 2020-05-14 17:42:58 +02:00
daniel c308d49c25 Fix retrocompatibility 2020-04-30 14:08:56 +02:00
Junichi Satoh 06ae3a61e8 Fixed widget title corruption in dashboard with multi-byte characters. 2020-04-30 15:39:32 +09:00
Daniel Barbero Martin 3280ad479f Fix dashboards 2020-04-13 15:01:18 +02:00
daniel 709201bf23 dashboards 2020-03-26 12:29:38 +01:00
Daniel Maya 9f9cc9beda Fixed injection sql in chart_generator 2020-01-23 10:40:55 +01:00
fbsanchez 5f32bfdb64 Datatype fix - ws engine 2019-12-13 11:58:12 +01:00
fbsanchez bb093482a7 Fix: ws session extraction 2019-12-11 13:04:45 +01:00
daniel 960326b980 Add menu omnishell 2019-11-21 18:21:46 +01:00
fbsanchez a0c610d988 WS fixed audit origin address 2019-10-24 12:18:49 +02:00
fbsanchez d34aa0917b WS tick interval, WS manager able to limit connections per session 2019-10-24 10:35:16 +02:00
fbsanchez 47e6f4adb5 Fix and control API sessions 2019-10-21 21:09:03 +02:00
fbsanchez 6c52462c8c Modular WebSocket engine, added ssh and telnet to quickshell extension 2019-10-21 17:36:26 +02:00
fbsanchez bb2faca479 ma 2019-10-21 12:18:42 +02:00
fbsanchez 1cf77cc8f1 WSProxy ACL check 2019-10-18 18:55:29 +02:00
fbsanchez e24024d2f4 WS gotty extension - global 2019-10-17 15:31:17 +02:00