Merge branch 's3-storage-class' into 'dev'

Adds s3 storage class configuration

See merge request Shinobi-Systems/Shinobi!497
plugin-touch-ups
Moe 2024-08-22 17:16:35 +00:00
commit 5f7cc2a149
6 changed files with 19 additions and 2 deletions

View File

@ -385,6 +385,7 @@
"Started": "Gestartet",
"Status Indicator": "Statusanzeige",
"Stop URL": "Stop-URL",
"Storage Class": "Speicherklassen",
"Stream": "Stream",
"Stream Flags": "Stream-Flags",
"Stream Timestamp": "Stream-Timestamp",

View File

@ -47,6 +47,7 @@
"Session Key": "Session Key",
"Active Monitors": "Active Monitors",
"Storage Use": "Storage Use",
"Storage Class": "Storage Class",
"Use Raw Snapshot": "Use Raw Snapshot",
"Failed to Edit Account": "Failed to Edit Account",
"How to Connect": "How to Connect",

View File

@ -504,6 +504,7 @@
"Stop": "Arrêt",
"Stop URL": "URL d'arrêt",
"Storage Location": "Emplacement de stockage",
"Storage Class": "Classes de Stockage",
"Stream": "Flux",
"Stream Channel": "Canal du flux de données",
"Stream Flags": "Etiquettes du flux",

View File

@ -943,6 +943,7 @@
"Stopping": "Fermarsi",
"Storage Location": "Posizione di archiviazione",
"Storage Use": "Uso di archiviazione",
"Storage Class": "Classi di Archiviazione",
"Stream": "Flusso",
"Stream Channel": "Canale di flusso",
"Stream Flags": "Flag di streaming",

View File

@ -1489,6 +1489,7 @@
"Stopping": "停止中",
"Storage Location": "Storage Location",
"Storage Use": "使用ストレージ",
"Storage Class": "ストレージクラス",
"Stream Channel": "Stream Channel",
"Stream Channels": "Stream Channels",
"Stream Flags": "ストリームフラグ",

View File

@ -1,7 +1,7 @@
// https://us-east-1.console.aws.amazon.com/iamv2/home#/users
const fs = require('fs');
const { S3Client, PutObjectCommand, DeleteObjectCommand, GetObjectCommand } = require("@aws-sdk/client-s3");
const { S3Client, PutObjectCommand, DeleteObjectCommand, GetObjectCommand, StorageClass} = require("@aws-sdk/client-s3");
module.exports = function(s,config,lang){
const genericRequest = async (groupKey,requestOptions) => {
@ -123,7 +123,8 @@ module.exports = function(s,config,lang){
Bucket: s.group[groupKey].init.aws_s3_bucket,
Key: saveLocation,
Body: fileStream,
ContentType: 'video/'+e.ext
ContentType: 'video/'+e.ext,
StorageClass: s.group[groupKey].init.aws_storage_class || StorageClass.STANDARD
}).then((response) => {
if(response.err){
s.userLog(e,{type:lang['Amazon S3 Upload Error'],msg:response.err})
@ -433,6 +434,17 @@ module.exports = function(s,config,lang){
}
]
},
{
"hidden": true,
"name": "detail=aws_storage_class",
"field": lang['Storage Class'],
"fieldType": "select",
"form-group-class": "autosave_aws_s3_input autosave_aws_s3_1",
"description": "The storage class of the uploaded objects see https://aws.amazon.com/s3/storage-classes/",
"default": StorageClass.STANDARD,
"example": StorageClass.STANDARD,
"possible": Object.keys(StorageClass).map(k => ({name: k, value: k})),
},
{
"hidden": true,
"name": "detail=aws_s3_log",