tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-30 17:25:26 +02:00
Code Issues Packages Projects Releases Wiki Activity
26,698 Commits 34 Branches 30 Tags
Commit Graph

26698 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rafael
08b6a8660c change ssh banner 2021-01-28 17:08:32 +01:00
Rafael Ameijeiras
000b1dd993 Merge branch 'ent-6970-deploy-script' into 'develop' 
changue ssh banner

See merge request artica/pandorafms!3805
 2021-01-28 17:05:00 +01:00
rafael
19f5f51d7c change ssh banner 2021-01-28 16:59:11 +01:00
Kevin
b213c38c10 Merge branch 'develop' of brutus.artica.es:artica/pandorafms into ent-6151-revisar-el-instalador-rpm-de-suse-me-esta-dando-errores 2021-01-28 16:46:42 +01:00
Rafael Ameijeiras
33b182075a Merge branch 'ent-6970-deploy-script' into 'develop' 
adding versioning

See merge request artica/pandorafms!3804
 2021-01-28 16:30:52 +01:00
rafael
2a20f7e930 adding localhost to condole config and adding versioning 2021-01-28 16:28:06 +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
Rafael Ameijeiras
39c1c05022 Merge branch 'ent-6970-deploy-script' into 'develop' 
Ent 6970 deploy script

See merge request artica/pandorafms!3803
 2021-01-28 15:32:51 +01:00
rafael
a5c09bebd7 adding localhost to condole config and adding versioning 2021-01-28 15:30:09 +01:00
rafael
01742670a5 adding localhost to condole config and adding versioning 2021-01-28 15:28:05 +01:00
Rafael Ameijeiras
72372520dc Merge branch 'ent-6970-deploy-script' into 'develop' 
adding deploy script for centos 7

See merge request artica/pandorafms!3795
 2021-01-28 13:49:35 +01:00
fbsanchez
9fc3856f83 WIP historical database automaintenance + minor fixes 2021-01-28 13:20:36 +01:00
Daniel Rodriguez
39a060bd99 Merge branch 'ent-6849-remove-visual-console-manager' into 'develop' 
Remove visual console manager extension

See merge request artica/pandorafms!3737
 2021-01-28 11:57:52 +01:00
Luis
e6cf2fe9eb Remove visual console manager extension 2021-01-28 11:57:52 +01:00
Daniel Rodriguez
4d84ae8b58 Merge branch 'ent-6844-quitar-vista-estadisticas-eventos' into 'develop' 
Removes event_statistics view

See merge request artica/pandorafms!3738
 2021-01-28 10:25:13 +01:00
Daniel Rodriguez
147bac8e55 Merge branch 'ent-6126-add-csv-json-save-to-disk-console-task' into 'develop' 
Added CSV an JSON formats in console task report save to disk

See merge request artica/pandorafms!3613
 2021-01-28 10:23:22 +01:00
Junichi Satoh
a88a563b45 Fixed garbled characters with multi-byte characters. 2021-01-28 10:49:54 +09:00
artica
ff80c974da Auto-updated build strings. 2021-01-28 01:00:18 +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
Daniel Rodriguez
0b661add35 Merge branch 'ent-6158-mejoras-a-servicios-dinamicos-expresiones-regulares-y-varios-custom-field' into 'develop' 
Definition matching Entity

See merge request artica/pandorafms!3648
 2021-01-27 14:40:40 +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
Luis
905f8801b7 Update 44.sql 2021-01-27 13:37:20 +01:00
fbsanchez
bcb2447edb WIP Historical database manager (setup) 2021-01-27 13:03:57 +01:00
fbsanchez
c7706a6bfa WIP Historical database manager (setup) 2021-01-27 12:35:37 +01:00
rafael
d3612c9ba9 adding features 2021-01-27 12:29:49 +01:00
Daniel Rodriguez
ccc10abc16 Merge branch 'ent-6643-show-summary-vmware' into 'develop' 
Ent 6643 show summary vmware

Closes pandora_enterprise#6643

See merge request artica/pandorafms!3611
 2021-01-27 11:20:36 +01:00
fbsanchez
12b76a03b1 Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 2021-01-27 10:12:27 +01:00
Luis Calvo
a09ee55d13 Added event_statistics to delete txt 2021-01-27 09:42:50 +01:00
Luis Calvo
f2addc837a Merge remote-tracking branch 'origin/develop' into ent-6126-add-csv-json-save-to-disk-console-task 2021-01-27 09:25:12 +01:00
artica
096bcd1ed3 Auto-updated build strings. 2021-01-27 01:00:19 +01:00
fbsanchez
25fd59cc31 Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 2021-01-26 17:49:32 +01:00
Luis Calvo
954c12646b Added task save report to disk changes to migrate 2021-01-26 16:46:45 +01:00
Luis Calvo
dc3ee2d553 Added task save report to disk changes to MR 2021-01-26 16:36:13 +01:00
Jose Gonzalez
d5b99f255a Solved issue 2021-01-26 13:46:12 +01:00
Daniel Rodriguez
0dcfa08725 Merge branch 'ent-6403-usuarios-se-ven-entre-si-workcpace-connected-users' into 'develop' 
Fixed connected users seeing all users

See merge request artica/pandorafms!3590
 2021-01-26 13:35:46 +01:00
Luis
29913883ae Fixed connected users seeing all users 2021-01-26 13:35:46 +01:00
artica
7d69ad114d Auto-updated build strings. 2021-01-26 01:00:11 +01:00
fbsanchez
192a635599 WIP setup.hdb 2021-01-25 19:29:22 +01:00
Daniel Maya
312a08219c Added disable/enable for discovery task 2021-01-25 13:56:04 +01:00
Jose Gonzalez
bc250f0789 Merge branch 'ent-6643-show-summary-vmware' of brutus.artica.es:artica/pandorafms into ent-6643-show-summary-vmware 2021-01-25 13:37:44 +01:00
Jose Gonzalez
38ea74ed11 Updated merge 2021-01-25 13:36:12 +01:00
fbsanchez
5799c3e199 composer paths updated 2021-01-25 13:35:58 +01:00
fbsanchez
d9428ce215 WIP DBMainainer, fixed Websockets library placement 2021-01-25 13:33:02 +01:00
Luis Calvo
778419e71d Merge remote-tracking branch 'origin/develop' into ent-6844-quitar-vista-estadisticas-eventos 2021-01-25 13:06:36 +01:00
Daniel Rodriguez
6063c4f50b Merge branch 'ent-6091-Suprimir-corregir-logs' into 'develop' 
Solved issue

Closes pandora_enterprise#6091

See merge request artica/pandorafms!3786
 2021-01-25 12:15:16 +01:00
artica
831d22bac1 Updated version and build strings. 2021-01-25 11:52:43 +01:00
Luis Calvo
84f3ead86a Added csv, json, xml formats to save report to disk task 2021-01-25 11:51:53 +01:00
marcos
74bdab5d00 add status filter on alert list 2021-01-25 11:00:24 +01:00