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

732 Commits

Author SHA1 Message Date
daniel af968b5e13 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-09-14 08:08:05 +02:00
Daniel Cebrian 9619854ba2 #12028 added secondary groups in tactical view 2023-09-12 16:35:45 +02:00
daniel ce0468b37e Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 
Conflicts:
	pandora_console/include/functions_menu.php
 2023-09-08 13:11:52 +02:00
miguel angel rasteu a433a78a4c #Fix graph 2023-09-07 10:44:46 +02:00
daniel 1a1087e311 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 
Conflicts:
	pandora_console/extras/mr/66.sql
 2023-09-04 08:16:48 +02:00
Pablo Aragon ce1c8cdbb7 11423-Graph analytics. Before Share & Export 2023-08-22 10:04:33 +02:00
daniel 7f82273dc4 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 
Conflicts:
	pandora_console/extras/mr/65.sql
 2023-08-09 08:59:01 +02:00
Daniel Maya 0d321f5311 #11739 Fixed deprecated functions 3 2023-08-01 11:19:04 +02:00
miguel angel rasteu 0c995b5dd5 #11755 Fix netflow live view pie graph 2023-07-25 10:33:29 +02:00
daniel 1bf7f1e36e ITSM pandora_enterprise#11471 2023-07-21 14:23:42 +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 Cebrian 018bfe1288 #10696 fixed resize circular mesh 2023-07-19 10:36:30 +02:00
daniel 9a72d0740c ITSM fixed pandora_enterprise#11471 2023-07-18 15:13:08 +02:00
Daniel Maya 5806da78dd #11487 Fixed subgroups 2023-07-18 10:18:30 +02:00
Matias Didier fde3857674 Merge branch 'ent-11476-cambiar-headers-de-copyright' into 'develop' 
Ent 11476 cambiar headers de copyright

See merge request artica/pandorafms!6069
 2023-06-22 13:24:47 +00:00
Daniel Cebrian 6ef2173632 #11574 changed netflow graph 2023-06-15 14:46:31 +02:00
miguel angel rasteu db62a91cb6 #11476 Fix https url 2023-06-08 13:19:01 +02:00
miguel angel rasteu 1f8752ee63 #11476 Fix pandora url 2023-06-08 13:10:16 +02:00
miguel angel rasteu 64204b6ff7 #11476 Fix ascci art 2023-06-08 12:42:10 +02:00
miguel angel rasteu 933f69f2ab #11476 Change copyright header 2023-06-08 11:53:13 +02:00
Daniel Cebrian 651894953a #11340 fixed Dynamic report in metaconsole 2023-05-25 09:36:58 +02:00
Daniel Maya e4b17428b7 #10474 visual changes 2023-04-27 10:05:20 +02:00
daniel a89e1aa534 new widget basic chart pandora_enterprise#10692 2023-04-20 10:16:18 +02:00
Rafael Ameijeiras cc2709c42c Merge branch 'ent-10699-errores-en-los-mapas-varios' into 'develop' 
Ent 10699 errores en los mapas varios

See merge request artica/pandorafms!5632
 2023-04-05 06:47:31 +00:00
Pablo Aragon ce014e4c6b Datatables. Treeview graph meta 2023-03-28 17:07:06 +02:00
Daniel Maya 712da9070f #10699 Fixed maps 2023-03-28 10:45:41 +02:00
Pablo Aragon 260caca63a 10021, 10224, 10652, 10414 2023-03-16 12:57:48 +01:00
Daniel Cebrian 7562a9253a #10347 refactoring and add link to events in graph 2023-03-03 13:13:49 +01:00
Daniel Cebrian cdf359481a #10347 cleared code for apply acl permission 2023-03-02 17:06:16 +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 ea51399460 #10347 create view tactic for groups with monitoring and alerts 2023-03-01 17:27:32 +01:00
daniel 3ef4482af2 fix custom graph sql pandora_enterprise#10196 2023-01-19 17:50:27 +01:00
daniel c32483a38a phpchartjs pandora_enterprise#9554 2022-12-23 11:34:35 +01:00
daniel 5907d55ec1 phpchartjs pandora_enterprise#9554 2022-12-22 23:03:52 +01:00
daniel 2b104ca905 phpchartjs pandora_enterprise#9554 2022-12-22 13:13:10 +01:00
daniel 36eda00ae6 fix errors in new charts pandora_enterprise#9554 2022-12-21 10:07:18 +01:00
Daniel Barbero 3e071a7d33 remove phamtomjs pandora_enterprise#9554 2022-12-20 12:23:18 +01:00
Daniel Barbero 1d01b8257d WIP pandora_enterprise#9554 2022-12-16 14:28:04 +01:00
Daniel Barbero 62aea35d7b fixed js render 2022-12-16 10:38:37 +01:00
Daniel Barbero 01d14ae3b8 new chart chartjs pandora_enterprise#9554 2022-12-13 09:10:13 +01:00
Daniel Barbero 6d19391c72 fix interfaces charts pandora_enterprise#9683 2022-10-27 16:12:17 +02:00
Daniel Maya 9d259a4097 #9029 Added starmap 3 2022-07-12 16:18:17 +02:00
Daniel Barbero Martin 95fca17fa9 Merge remote-tracking branch 'origin/develop' into ent-8621-copiando-a-grafana-4-color-tabs-como-widget-en-dashboard 2022-06-30 12:52:49 +02:00
Jimmy Olano efa0640d8c Merge branch 'ent-9121-13735-no-aparece-nombre-modulos-en-leyenda-seccion-graficas-dentro-del-agente-v762' into 'develop' 
legend combined graph module view pandora_enterprise#9121

pandora_enterprise#9121

See merge request artica/pandorafms!4986
 2022-06-29 22:37:25 +00:00
Daniel Barbero Martin 867c6a1415 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
 2022-06-28 17:02:01 +02:00
daniel 867e659118 Merge branch 'ent-1419-umbrales-en-graficas-pdf-4649-com1' into 'develop' 
add treshold pdf pandora_enterprise#1419

See merge request artica/pandorafms!4894
 2022-06-28 13:45:53 +00:00
Daniel Barbero Martin d969ac42bf legend combined graph module view pandora_enterprise#8621 2022-06-27 17:09:27 +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