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

589 Commits

Author SHA1 Message Date
Daniel Cebrian a1d02e4f4d #11233 fixed bug no data in basic chart 2023-05-17 09:50:08 +02:00
Rafael Ameijeiras 4f5315db98 Merge branch 'ent-11171-15556-edicion-de-historico-sigue-fallando-en-771' into 'develop' 
Ent 11171 15556 edicion de historico sigue fallando en 771

See merge request artica/pandorafms!5875
 2023-05-16 12:31:16 +00:00
Rafael Ameijeiras 5e4fee412d Merge branch 'ent-11193-dashboard-widget-color-tabs-modules-no-carga-cuando-hay-modulos-string' into 'develop' 
Ent 11193 dashboard widget color tabs modules no carga cuando hay modulos string

See merge request artica/pandorafms!5896
 2023-05-16 12:29:52 +00:00
Daniel Cebrian 45ecf362d8 #11190 safe output in filter agent tree widget 2023-05-16 13:22:33 +02:00
Daniel Rodriguez e2ef02081a Merge branch 'ent-11179-15577-errores-en-varios-widgets-de-dashboard' into 'develop' 
Ent 11179 15577 errores en varios widgets de dashboard

See merge request artica/pandorafms!5884
 2023-05-16 09:43:38 +00:00
Daniel Maya 605181f4e6 #11193 fix string 2023-05-12 14:25:35 +02:00
Matias Didier 2b4a362e06 Merge branch 'ent-10733-alinear-forma-horizontal-del-widget-avg-max-min-sum' into 'develop' 
Ent 10733 alinear forma horizontal del widget avg max min sum

See merge request artica/pandorafms!5750
 2023-05-12 06:18:18 +00:00
Daniel Maya 45d6f2b5f5 #11179 Fixed heatmap and latest events 2023-05-11 12:05:00 +02:00
Daniel Maya d26ae96670 #11171 Fix historical database with php 8.1 2023-05-10 15:15:03 +02:00
Daniel Cebrian 0e58a9b2fb #added new type bars in widget and change legend 2023-05-08 14:46:46 +02:00
Daniel Cebrian 042591c57b #9162 added new select for order columns in widgets 2023-05-08 10:35:59 +02:00
Calvo 4f48fa4450 Fix ws test button 2023-05-05 11:25:33 +02:00
Calvo fb7a94ddd4 Fix ws exceptions on socket close event 2023-05-04 14:34:50 +02:00
Daniel Cebrian 48d7eb2514 #10733 align text widget hotizontally 2023-04-20 11:15:34 +02:00
daniel a89e1aa534 new widget basic chart pandora_enterprise#10692 2023-04-20 10:16:18 +02:00
Rafael Ameijeiras d40091a8f3 Merge branch 'ent-10066-poner-recursividad-para-grupos-en-widget-triggered-alerts-report' into 'develop' 
Ent 10066 poner recursividad para grupos en widget triggered alerts report

See merge request artica/pandorafms!5666
 2023-04-19 12:40:16 +00:00
Jonathan ad0e922ece #10966 change style widget info groups 2023-04-18 12:56:18 +02:00
Matias Didier e4fd12f6de Merge branch 'ent-10067-anadir-filtro-alerts-triggered-en-tree-view-y-widget-tree-view' into 'develop' 
Ent 10067 anadir filtro alerts triggered en tree view y widget tree view

See merge request artica/pandorafms!5662
 2023-04-17 11:06:10 +00:00
Rafael Ameijeiras 57ec600bd1 Merge branch 'ent-10912-enlaces-a-agente-en-la-vista-tactica-de-grupo-lleva-a-la-edicion-de-agente-deberia-ir-a-la' into 'develop' 
Ent 10912 enlaces a agente en la vista tactica de grupo lleva a la edicion de agente deberia ir a la

See merge request artica/pandorafms!5716
 2023-04-13 13:07:05 +00:00
Rafael Ameijeiras b78acc28ca Merge branch 'ent-10310-14620-Widget-General-group-status-no-funciona-correctamente-en-la-Metaconsola' into 'develop' 
fixed group link on General group status widget

See merge request artica/pandorafms!5711
 2023-04-13 12:45:19 +00:00
Jonathan 7730ca6469 #10912 link to agent view in tactical group view 2023-04-13 12:16:32 +02:00
Matias Didier 250d65d94a Merge branch 'ent-10740-mejoras-en-heatmap' into 'develop' 
Ent 10740 mejoras en heatmap

See merge request artica/pandorafms!5660
 2023-04-13 08:24:18 +00:00
alejandro.campos@artica.es 153b978778 fixed group link on General group status widget 2023-04-13 09:18:55 +02:00
daniel c0172afc3d update composer 2023-04-10 16:38:37 +02:00
Pablo Aragon 2dc8b25ddc 10066-Recursion group widget alerts triggered 2023-04-05 12:59:52 +02:00
Pablo Aragon 73d7345844 10067-Alerts triggered filter tree view 2023-04-05 09:14:01 +02:00
Daniel Maya dc654c0b6d #10740 heatmap improvements 2023-04-04 15:14:10 +02:00
Jimmy Olano 89aa227b98 Merge branch 'ent-10734-sistema-de-favoritos-no-actualiza-nombre-en-el-menu-lateral-del-objeto-favorito-consola-visual' into 'develop', JJOS. 
Ent 10734 sistema de favoritos no actualiza nombre en el menu lateral del objeto favorito consola visual

See merge request artica/pandorafms!5613
 2023-04-04 11:57:45 +00:00
Jonathan 4aaddf063c Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-31 09:52:06 +02:00
Jonathan 93966788eb Slides require mesage 2023-03-31 09:51:48 +02:00
daniel 24e5fca884 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-30 17:34:06 +02:00
Pablo Aragon 98acf2b864 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-30 16:50:40 +02:00
Pablo Aragon 3a2cbb7a62 Datatables & styles fix 2023-03-30 16:50:30 +02:00
Jonathan 9635b4b721 Dashboard slides fix 2023-03-30 16:45:27 +02:00
Daniel Cebrian f442272177 Merge branch 'develop' into ent-10633-pantalla-de-timeout 2023-03-30 09:30:38 +02:00
Daniel Cebrian b9fc352578 merge develop into ent-10633-pantalla-de-timeout 2023-03-30 09:15:10 +02:00
Jonathan 8c3b5d650d tree view dashboard metaconsole 2023-03-29 16:50:17 +02:00
Alejandro Campos e909686ddc Merge branch 'develop' into 'ent-4289-8282-RWORKS-Poder-escoger-el-servidor-que-ejecute-una-CronJob' 
# Conflicts:
#   pandora_console/extras/mr/62.sql
 2023-03-28 14:09:33 +00: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 56e4770b93 fixed styles 2023-03-23 14:20:54 +01:00
Daniel Maya 52231615f6 Merge branch 'develop' into ent-8642-nuevo-widget-heatmap 2023-03-23 11:51:54 +01:00
Pablo Aragon e2820d1ad7 9680-Fix widget 2023-03-23 09:18:39 +01:00
Daniel Cebrian b81b7ce7af #fixed in fav menu when change name the original name 2023-03-17 12:25:43 +01:00
Jonathan 30538265e8 Cluster wizzard visual fix 2023-03-15 16:06:42 +01:00
Pablo Aragon 00a5e8e84b Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-15 11:30:40 +01:00
Pablo Aragon 938e8cd777 Dashboards widgets 2023-03-15 11:30:22 +01:00
daniel cec81f1cc2 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 
Conflicts:
	pandora_console/extras/mr/62.sql
 2023-03-14 18:17:54 +01:00
Pablo Aragon 620bff28af Dashboards widgets 2023-03-14 15:59:20 +01:00
Pablo Aragon 658f2853f7 Dashboards widgets 2023-03-14 14:56:33 +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
daniel c96ac79726 fixed styles 2023-03-13 19:30:51 +01:00
Daniel Cebrian 90f0c3771f #10324 fixed deleted element fav menu 2023-03-13 17:21:28 +01:00
Daniel Cebrian 64cc261483 Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-13 16:48:47 +01:00
Daniel Maya 0e4d423825 Merge branch 'develop' into ent-8642-nuevo-widget-heatmap 2023-03-13 15:17:18 +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
alejandro.campos@artica.es 39a119d150 Merge remote-tracking branch 'origin/develop' into ent-4289-8282-RWORKS-Poder-escoger-el-servidor-que-ejecute-una-CronJob 2023-03-10 13:29:20 +01:00
Daniel Maya 030a37a5da Merge branch 'develop' into ent-8642-nuevo-widget-heatmap 2023-03-10 12:19:00 +01:00
Pablo Aragon 4ebe7ee790 9680-Conflict 2023-03-10 09:38:55 +01:00
Jose Gonzalez edbc9d8f6b Icons review 2023-03-09 23:31:40 +01:00
Jonathan 1e2657fed3 Chart generator bug solution 2023-03-09 14:15:18 +01:00
Daniel Cebrian 3ec11f4c9d Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-08 12:55:53 +01:00
Daniel Cebrian fdc73be979 Merge branch 'develop' into ent-10347-vista-tactica-de-grupo 2023-03-07 13:19:52 +01:00
Jose Gonzalez 5ecc3470e2 Tree View in dashboard minor fixes 2023-03-06 23:48:06 +01:00
daniel 5ba9e0e9aa fixed styles 2023-03-06 16:21:10 +01:00
Jose Gonzalez e33a9bc3e4 Services TreeView 2023-03-06 13:32:21 +01:00
Pablo Aragon daf179f1f6 Conflit resolved 2023-03-06 08:32:28 +01:00
daniel f6e063b981 Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones 
Conflicts:
	pandora_console/include/class/SnmpConsole.class.php
 2023-03-06 08:09:29 +01:00
Jimmy Olano 6b55c65330 Merge branch 'ent-10092-14739-peticion-de-filtro-en-widget-tree-view' into 'develop', JJOS. 
Ent 10092 14739 peticion de filtro en widget tree view

See merge request artica/pandorafms!5532
 2023-03-05 22:56:35 +00:00
daniel ff3b7001c3 fixed styles 2023-03-04 13:22:52 +01:00
Daniel Cebrian 7562a9253a #10347 refactoring and add link to events in graph 2023-03-03 13:13:49 +01:00
Alejandro Campos 3ddb3c1034 Merge branch 'develop' into 'ent-4289-8282-RWORKS-Poder-escoger-el-servidor-que-ejecute-una-CronJob' 
# Conflicts:
#   pandora_console/extras/mr/62.sql
#   pandora_console/pandoradb.sql
 2023-03-03 08:12:57 +00:00
daniel 310ad88707 fixed styles 2023-03-02 19:25:31 +01:00
Daniel Cebrian af5a620883 #10347 fixed urls monitors and added name group 2023-03-02 16:22:25 +01:00
Daniel Cebrian dc6256058f #10347 added list agents in tactical view groups 2023-03-02 13:48:14 +01:00
Daniel Cebrian a4a5650a01 #10347 added modal in heatmap agent 2023-03-02 11:10:37 +01: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 Cebrian ea51399460 #10347 create view tactic for groups with monitoring and alerts 2023-03-01 17:27:32 +01:00
Daniel Cebrian 08fb4e3396 #10324 fixed delete element in favmenu 2023-02-27 10:07:35 +01:00
Daniel Cebrian 728991ad9a #10324 delete fav menu when delete element 2023-02-24 13:36:13 +01:00
alejandro.campos@artica.es 6c64ccd6d6 implemented consoles management 2023-02-21 15:32:45 +01:00
Daniel Maya d4f6baa9bb #8642 Added heatmap widget 2 2023-02-21 15:06:58 +01:00
Daniel Maya 6efaa2bbc6 #8642 Added heatmap widget 2023-02-21 15:06:15 +01:00
Jonathan 005fbd27c1 Tree view meta fix 2023-02-21 11:20:17 +01:00
Pablo Aragon 0125ba742b 9680-Create widget ModulesByStatus 2023-02-15 11:42:50 +01:00
Pablo Aragon 87c3bee756 9666-New widget Event cardboard 2023-02-15 11:23:36 +01:00
Pablo Aragon feb2f3ffa2 10092-Widget tree view, Not normal status 2023-02-13 15:03:23 +01:00
Pablo Aragon b439ed684e 9859-Widget AvgSumMaxMinModule 2023-02-10 10:31:41 +01:00
Pablo Aragon f35acde8eb 9680-Create widget ModulesByStatus 2023-02-09 10:37:12 +01:00
Pablo Aragon 971fc84a47 9680-Create widget ModulesByStatus 2023-02-09 10:12:59 +01:00
Jose Gonzalez 0a61f6dcc7 WIP: User management View and BL 2023-02-03 14:10:26 +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
Rafael Ameijeiras 1ed1b19cd0 Merge branch 'ent-9829-listado-de-dashboards-en-pantalla-de-inicio' into 'develop' 
Fix list all private dashboards on user edition

See merge request artica/pandorafms!5320
 2023-01-24 11:59:23 +00:00
Calvo 63806556de Fix user dashboard homescreen permissions 2023-01-24 10:12:37 +01:00
Rafael Ameijeiras b0167af928 Merge branch 'ent-10103-cambio-en-vista-de-threeshold-de-clusters' into 'develop' 
Ent 10103 cambio en vista de threeshold de clusters

See merge request artica/pandorafms!5390
 2023-01-23 15:28:06 +00:00
Calvo 2fc1abc893 Merge remote-tracking branch 'origin/develop' into ent-9829-listado-de-dashboards-en-pantalla-de-inicio 2023-01-18 11:33:21 +01:00