Skip to content

Commit

Permalink
Cloud Log Manager modals shows cluster id
Browse files Browse the repository at this point in the history
  • Loading branch information
tommaso-ascani committed Jul 17, 2024
1 parent 654bcc1 commit a5d76a9
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 1 deletion.
3 changes: 2 additions & 1 deletion core/ui/public/i18n/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -1390,6 +1390,7 @@
"learn_more": "Learn more",
"address_placeholder": "E.g. https://nar.nethesis.it",
"available_with_subscription_title": "Activate subscription to enable this feature",
"available_with_subscription": "Send a stream of logs from applications and nodes of this cluster to Cloud Log Manager, where you can store, archive, and search them in a central place."
"available_with_subscription": "Send a stream of logs from applications and nodes of this cluster to Cloud Log Manager, where you can store, archive, and search them in a central place.",
"cluster_id_notification": "This cluster is identified as '{clusterId}' in the Cloud Log Manager UI"
}
}
15 changes: 15 additions & 0 deletions core/ui/src/components/settings/CloudLogManagerConfigureModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,16 @@
}}</template>
<template slot="content">
<cv-form v-if="subscription">
<NsInlineNotification
v-if="clusterId"
kind="info"
:description="
$t('cloud_log_manager_forwarder.cluster_id_notification', {
clusterId: clusterId,
})
"
:showCloseButton="false"
/>
<NsToggle
:label="$t('cloud_log_manager_forwarder.export_to_cloud_log_manager')"
v-model="toggleEnabled"
Expand Down Expand Up @@ -148,6 +158,7 @@ export default {
toggleEnabled: false,
address: "",
tenant: "",
clusterId: "",
date: "",
time: "",
lastTimestampFormatted: "",
Expand Down Expand Up @@ -202,6 +213,10 @@ export default {
this.tenant = this.configuration.tenant;
}
if (!this.configuration.cluster_id == "") {
this.clusterId = this.configuration.cluster_id;
}
if (this.configuration.last_timestamp == "") {
this.radioVal = "choose_date_time";
} else {
Expand Down

0 comments on commit a5d76a9

Please sign in to comment.