diff --git a/packages/manager/modules/dbaas-logs/src/logs/detail/streams/add/logs-streams-add.controller.js b/packages/manager/modules/dbaas-logs/src/logs/detail/streams/add/logs-streams-add.controller.js index 508f3ed677be..8c95c7d9f435 100644 --- a/packages/manager/modules/dbaas-logs/src/logs/detail/streams/add/logs-streams-add.controller.js +++ b/packages/manager/modules/dbaas-logs/src/logs/detail/streams/add/logs-streams-add.controller.js @@ -59,7 +59,7 @@ export default class LogsStreamsAddCtrl { this.LogsConstants.CONSUMPTION_CAPACITY, ) && capabilities.maximumQuantity === - this.LogsConstants.INDEXING_TIERING, + this.LogsConstants.INDEXING_TIERING.MEDIUM, ); const indexingSecondStepPrice = add.plan.details.pricings.default.find( (capabilities) => @@ -67,7 +67,7 @@ export default class LogsStreamsAddCtrl { this.LogsConstants.CONSUMPTION_CAPACITY, ) && capabilities.minimumQuantity === - this.LogsConstants.INDEXING_TIERING + 1, + this.LogsConstants.INDEXING_TIERING.MEDIUM + 1, ); this.indexingStoragePrice.FirstStep.price = indexingFirstStepPrice.price.text; @@ -187,17 +187,13 @@ export default class LogsStreamsAddCtrl { return `${desc} ${price}`; } - getIndexingPrices() { + getIndexingPrices(size, values) { return this.$translate.instant( - 'logs_streams_enable_indexing_description', - { - t0: this.indexingStoragePrice.FirstStep.price, - t1: this.LogsConstants.INDEXING_TIERING, - t2: this.indexingStoragePrice.SecondStep.price, - }, + `logs_streams_enable_indexing_description_detail_${size}`, + values, undefined, false, - 'sceParameters', // Expose devise symbol from API without sanitization + 'sceParameters', ); } diff --git a/packages/manager/modules/dbaas-logs/src/logs/detail/streams/add/logs-streams-add.html b/packages/manager/modules/dbaas-logs/src/logs/detail/streams/add/logs-streams-add.html index d23f860affa8..599394935ff7 100644 --- a/packages/manager/modules/dbaas-logs/src/logs/detail/streams/add/logs-streams-add.html +++ b/packages/manager/modules/dbaas-logs/src/logs/detail/streams/add/logs-streams-add.html @@ -60,9 +60,28 @@ + > + + +

+ +
diff --git a/packages/manager/modules/dbaas-logs/src/logs/logs-constants.js b/packages/manager/modules/dbaas-logs/src/logs/logs-constants.js index 83c7386ff3c8..cf1a4011c9da 100644 --- a/packages/manager/modules/dbaas-logs/src/logs/logs-constants.js +++ b/packages/manager/modules/dbaas-logs/src/logs/logs-constants.js @@ -276,7 +276,10 @@ export default { STREAM: 'logs-indexed-in-gb', }, COLDSTORAGE_INCREMENT: 1, - INDEXING_TIERING: 100, + INDEXING_TIERING: { + SMALL: 1, + MEDIUM: 100, + }, productName: 'logs', logstash: 'LOGSTASH', flowgger: 'FLOWGGER', diff --git a/packages/manager/modules/dbaas-logs/src/logs/order/order.routing.js b/packages/manager/modules/dbaas-logs/src/logs/order/order.routing.js index 8fdb89807248..822b36cce4d5 100644 --- a/packages/manager/modules/dbaas-logs/src/logs/order/order.routing.js +++ b/packages/manager/modules/dbaas-logs/src/logs/order/order.routing.js @@ -48,7 +48,7 @@ export default /* @ngInject */ ($stateProvider) => { LogsConstants.CONSUMPTION_CAPACITY, ) && capabilities.minimumQuantity === - LogsConstants.INDEXING_TIERING + 1, + LogsConstants.INDEXING_TIERING.MEDIUM + 1, ); const standardPlanPrice = { diff --git a/packages/manager/modules/dbaas-logs/src/logs/translations/Messages_fr_FR.json b/packages/manager/modules/dbaas-logs/src/logs/translations/Messages_fr_FR.json index 949e239718a6..90dc2a424f49 100644 --- a/packages/manager/modules/dbaas-logs/src/logs/translations/Messages_fr_FR.json +++ b/packages/manager/modules/dbaas-logs/src/logs/translations/Messages_fr_FR.json @@ -305,7 +305,10 @@ "logs_streams_update_title": "Modifier le flux", "logs_streams_update_description": "Pour le flux {{ name }}", "logs_streams_enable_indexing": "Activer l'indexation", - "logs_streams_enable_indexing_description": "Explorez vos logs sur Graylog et OpenSearch ({{t0}} HT /Go/mois pour les {{t1}} premiers Go, {{t2}} HT /Go/mois au delà)", + "logs_streams_enable_indexing_description": "Explorez vos logs sur Graylog et OpenSearch.", + "logs_streams_enable_indexing_description_detail_small": "Stockage de logs < {{t0}} Go de logs : Offert", + "logs_streams_enable_indexing_description_detail_medium": "Stockage de logs de {{t0}} à {{t1}} Go de logs : {{t2}} HT/Go/mois", + "logs_streams_enable_indexing_description_detail_large": "Stockage de logs pour des volumes plus importants (au-delà de {{t0}} Go) : {{t1}} HT/Go/mois", "logs_streams_no_limit": "Aucune limitation", "logs_streams_enable_websocket": "Activer la diffusion WebSocket", "logs_streams_enable_websocket_description": "Suivez la réception de vos logs en temps réel via le protocole WebSocket.",