Commit Graph

36345 Commits

Author SHA1 Message Date
Jorge Rincon 3988968198 Merge branch 'ent-8365-ncm-fase-3' of https://brutus.artica.es:8081/artica/pandorafms into ent-8365-ncm-fase-3 2023-11-07 15:23:27 +01:00
Jorge Rincon 2d7895b39b #8365 Fixed ncm reports of html type 2023-11-07 15:22:22 +01:00
Enrique Martin 8700d11461 Fixed agent data scripts on pandoradb_data.sql 2023-11-07 13:13:45 +01:00
Enrique Martin 86804398fe Fixed SQL issue 2023-11-06 16:50:54 +01:00
Enrique Martin 26ed76b821 Fixed SQL issue 2023-11-06 16:41:37 +01:00
Enrique Martin c266640f39 Fixed syntax error in SQL 2023-11-06 15:07:43 +01:00
Enrique Martin 3506ba1b5a Added default NCM templates 2023-11-06 15:06:16 +01:00
Jorge Rincon 366018b0e9 Merge branch 'ent-8365-ncm-fase-3' of https://brutus.artica.es:8081/artica/pandorafms into ent-8365-ncm-fase-3 2023-11-03 14:27:52 +01:00
Jorge Rincon 513a0bc296 #8365 Added csv report for device lists.
Fixed overlay for modals
2023-11-03 14:25:44 +01:00
Enrique Martin e6f505da54 Removed encryption functions from Tools.pm exporting 2023-11-02 12:53:38 +01:00
Enrique Martin 9e4ba18f49 Changed pandoraPlugintools encryption funcion and removed encryption functions from Tools.pm 2023-11-02 12:52:31 +01:00
Enrique Martin dc64816763 Exported encrypt and decrypt functions in Tools.pm 2023-11-02 11:26:20 +01:00
Enrique Martin 1a021c9689 Added Rijndael encryption for python pandoraPlugintools and PandoraFMS::Tools 2023-11-02 11:24:50 +01:00
felix.suarez 3031e7ddbd Add export Encrypt AES to tools 2023-11-01 10:13:44 -06:00
Jorge Rincon 1b9d7779d6 Merge branch 'ent-8365-ncm-fase-3' of https://brutus.artica.es:8081/artica/pandorafms into ent-8365-ncm-fase-3 2023-10-31 17:31:09 +01:00
Jorge Rincon f5e7ac8d4a #8365 PDF report added for ncm backups 2023-10-31 17:27:28 +01:00
Jonathan 98332d728e #8365 change name ncm agent data 2023-10-31 16:55:35 +01:00
Jonathan b327c824da #8365 NCM new special templates 2023-10-31 13:45:26 +01:00
Jorge Rincon dda21b162d Merge branch 'ent-8365-ncm-fase-3' of https://brutus.artica.es:8081/artica/pandorafms into ent-8365-ncm-fase-3 2023-10-30 17:23:10 +01:00
Jorge Rincon 7db3e3bb2b #8365 Added html report for ncm backups 2023-10-30 17:20:58 +01:00
Jonathan 307fd7b8cb #8365 remove fk tncm_queue 2023-10-30 10:52:13 +01:00
Jorge Rincon ad81b26556 Merge branch 'ent-8365-ncm-fase-3' of https://brutus.artica.es:8081/artica/pandorafms into ent-8365-ncm-fase-3 2023-10-30 10:20:31 +01:00
Jorge Rincon 84b9ac14fb #8365Added viewer report for ncm backups 2023-10-30 10:18:29 +01:00
Jonathan 63c74e2aa9 #8365 recovery after vscode revert error 2023-10-30 08:55:21 +01:00
Jonathan e062db2439 #8365 NCM add backup id to ncm queue 2023-10-30 08:39:20 +01:00
Jonathan c01af3e9b6 Merge branch 'ent-8365-ncm-fase-3' of brutus.artica.es:artica/pandorafms into ent-8365-ncm-fase-3 2023-10-30 08:37:37 +01:00
artica 9cc5937c96 Auto-updated build strings. 2023-10-30 01:00:18 +01:00
artica d43b7d14fa Auto-updated build strings. 2023-10-29 01:00:20 +02:00
artica 2f07f59a7b Auto-updated build strings. 2023-10-28 01:00:20 +02:00
Jorge Rincon f78f9d3504 Merge branch 'ent-8365-ncm-fase-3' of https://brutus.artica.es:8081/artica/pandorafms into ent-8365-ncm-fase-3 2023-10-27 14:34:00 +02:00
Jorge Rincon 407a505a3e #8365 Added reports for ncm backups. 2023-10-27 14:32:48 +02:00
Matias Didier 37a25c4873 Merge branch 'ent-12307-automonitorizacion-mysql-reads' into 'develop'
Ent 12307 automonitorizacion mysql reads

See merge request artica/pandorafms!6604
2023-10-27 10:18:25 +00:00
Calvo ecdb2cfd15 Merge remote-tracking branch 'origin/develop' into ent-12307-automonitorizacion-mysql-reads 2023-10-27 11:06:40 +02:00
artica c97d62ff0e Auto-updated build strings. 2023-10-27 01:00:24 +02:00
Daniel Rodriguez ba3d12eb0e Merge branch 'ent-11931-made-selector-de-modulo-donde-se-activa-made-monitoring-anomaly-detection-engine' into 'develop'
Added enable MADE option to modules and bulk op

See merge request artica/pandorafms!6385
2023-10-26 16:39:16 +00:00
Calvo 936508174f Fix merge errors 2023-10-26 16:24:49 +02:00
Calvo aaea2e59c4 Fix MADE minor bugs 2023-10-26 16:23:07 +02:00
Calvo 763f656822 Merge remote-tracking branch 'origin/develop' into ent-11931-made-selector-de-modulo-donde-se-activa-made-monitoring-anomaly-detection-engine 2023-10-26 14:31:22 +02:00
Jonathan 90249d4631 #8365 NCM add backup id to ncm queue 2023-10-26 12:49:30 +02:00
Jorge Rincon f521f3e9bb Merge branch 'ent-8365-ncm-fase-3' of https://brutus.artica.es:8081/artica/pandorafms into ent-8365-ncm-fase-3 2023-10-26 12:37:50 +02:00
Jorge Rincon f00ac9ea89 #8365 added donut icon in svg 2023-10-26 12:19:42 +02:00
Calvo 82d8af0fb5 Merge remote-tracking branch 'origin/develop' into ent-12307-automonitorizacion-mysql-reads 2023-10-26 11:48:18 +02:00
Calvo 235701edb9 Fix mysql questions reads/writes module undef value 2023-10-26 10:21:49 +02:00
artica 3a00e47c82 Auto-updated build strings. 2023-10-26 01:00:22 +02:00
Daniel Rodriguez b841dbcee8 Merge branch 'ent-12328-syslogserver-logserver-y-eventserver-por-defecto-activados' into 'develop'
Ent 12328 syslogserver logserver y eventserver por defecto activados

See merge request artica/pandorafms!6602
2023-10-25 13:59:46 +00:00
Matias Didier 88deb7bd83 Merge branch 'ent-9814-nuego-item-graficas-de-capacity-planning-en-dashboard' into 'develop'
Ent 9814 nuego item graficas de capacity planning en dashboard

See merge request artica/pandorafms!6591
2023-10-25 13:42:53 +00:00
Jonathan 4b8b296722 #9814 dashboard size fix 2023-10-25 15:33:18 +02:00
Calvo 078081be4e Missing var declaration 2023-10-25 13:22:46 +02:00
Rafael Ameijeiras 50d3139dc7 Merge branch 'ent-10602-Inventory-widget-2' into 'develop'
Ent 10602 inventory widget 2

See merge request artica/pandorafms!6589
2023-10-25 11:07:55 +00:00
Calvo 5f4c0fcad4 Fix default value and unit for mysql questions modules 2023-10-25 13:05:31 +02:00