Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Pro features block on unprovisioned license screen #704

Merged
merged 3 commits into from
Jan 6, 2025
Merged

Add Pro features block on unprovisioned license screen #704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
70d3ff2
remove extra char
jertel Dec 26, 2024
2e78f61
Merge branch '2.4/dev' into jertel/wip
jertel Jan 6, 2025
4a0135f
add pro features block
jertel Jan 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions html/css/app.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -947,4 +947,18 @@ ul ul ul {

.title-case {
text-transform: capitalize !important;
}

#proFeatures {
background-image: url('../images/pro-star.png');
background-repeat: no-repeat;
background-position: right top;
}

.marketing.v-theme--dark {
background-color: rgb(var(--v-theme-background-lighten-1)) !important;
}

.marketing.v-theme--light {
background-color: rgb(var(--v-theme-background-darken-1)) !important;
}
Binary file added html/images/pro-star.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 17 additions & 3 deletions html/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2228,6 +2228,21 @@ <h2 v-text="i18n.licensing"></h2>
<v-col cols="9" class="pa-1">{{ formatDateTime($root.licenseKey.expiration) }}</v-col>
</v-row>
</span>
<v-sheet v-else id="proFeatures" rounded="lg" class="marketing pa-4 ma-4" elevation="10">
<h3>You're missing out on some Pro features!</h3>
<ul class="my-2">
<li>OpenID Connect 3rd-party authentication
<li>Disk encryption
<li>FIPS OS compliance
<li>STIG OS compliance
<li>External notifications
<li>Time tracking inside of Cases
<li>Guaranteed Message Delivery
<li>External API
</ul>
To learn more about these Pro features, please visit our website:
<a href="https://securityonion.com/pro">https://securityonion.com/pro</a>
</v-sheet>
</v-container>
<v-container v-if="$root.licenseKey && ($root.licenseStatus != LICENSE_STATUS_UNPROVISIONED && $root.licenseStatus != LICENSE_STATUS_INVALID)" fluid id="licenseDetails" class="float">
<v-row class="my-1">
Expand All @@ -2253,20 +2268,19 @@ <h2 v-text="i18n.licensing"></h2>
<v-row class="my-1">
<v-col cols="3" class="pa-1 text-right font-weight-bold text-no-wrap">{{ i18n.features }}:</v-col>
<v-col v-if="$root.licenseKey.features" cols="9" class="pa-1">
<v-chip v-for="feature in $root.licenseKey.features" v-if="$root.localizeMessage(feature) != feature" small class="mx-1">
<v-chip v-for="feature in $root.licenseKey.features" v-if="$root.localizeMessage(feature) != feature" small class="ma-1">
{{ $root.localizeMessage(feature) }}
</v-chip>
</v-col>
<v-col v-else cols="9" class="pa-1">{{ i18n.all }}</v-col>
</v-row>
</v-container>
</v-card-text>
</v-card>
</v-tabs-window-item>

<v-tabs-window-item value="terms">
<v-card variant="outlined" class="my-4 subtle-border">
<v-card-text class="text-grey">
<v-card-text>
<div class="text-h5 mt-8 mb-3">
Elastic License 2.0 (ELv2) Terms
</div>
Expand Down
2 changes: 1 addition & 1 deletion model/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (

type Setting struct {
// The ID of the configuration setting. Each period represents a nested level.
Id string `json:"id" example:"elastalert.alerter_parameters")`
Id string `json:"id" example:"elastalert.alerter_parameters"`
// (metadata) The configuration setting more human-friendly title, if one is available.
Title string `json:"title" example:"Custom Configuration Parameters"`
// (metadata) A description explaining the purpose of the configuration setting, if one is available.
Expand Down
Loading