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

Jump to bottom

Add logging output forms for OpenSearch and Redis #6703

Merged
merged 2 commits into from
Nov 22, 2022
Merged

Add logging output forms for OpenSearch and Redis #6703

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f19624d
Add logging output forms for OpenSearch and Redis
bashofmann Aug 19, 2022
d87bef5
Minor changes to ClusterOutputs
catherineluse Nov 22, 2022
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
11 changes: 11 additions & 0 deletions shell/assets/translations/en-us.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2556,6 +2556,15 @@ logging:
clientKeyPass: Client Key Pass from Secret
verifySsl: Verify SSL
sslVersion: SSL Version
redis:
host: Host
port: Port
dbNumber: Redis database number
ttl: TTL for each key
password: Password from Secret
format:
title: Format
type: Type
gelf:
host: Host
port: Port
Expand Down Expand Up @@ -2686,6 +2695,8 @@ logging:
configuration: Configuration
outputProviders:
elasticsearch: Elasticsearch
opensearch: OpenSearch
redis: Redis
splunkHec: Splunk
kafka: Kafka
forward: Fluentd
Expand Down
213 changes: 213 additions & 0 deletions shell/edit/logging.banzaicloud.io.output/providers/opensearch.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,213 @@
<script>
import { LabeledInput } from '@components/Form/LabeledInput';
import LabeledSelect from '@shell/components/form/LabeledSelect';
import SecretSelector from '@shell/components/form/SecretSelector';
import { Checkbox } from '@components/Form/Checkbox';
import { _CREATE } from '@shell/config/query-params';
import { updatePort, protocol, sslVersions } from './utils';

export default {
components: {
LabeledInput, LabeledSelect, SecretSelector, Checkbox
},
props: {
value: {
type: Object,
default: () => {
return {};
}
},
disabled: {
type: Boolean,
default: false
},
mode: {
type: String,
required: true,
},
namespace: {
type: String,
required: true
}
},
data() {
if (this.mode === _CREATE) {
// Set default values only if no values are already
// present. This allows changes to default values to persist
// after navigating to YAML and back.

// Require SSL verification by default
if (typeof this.value.ssl_verify === 'undefined') {
this.$set(this.value, 'ssl_verify', true);
}

// Use the SSL version TLSv1_2 by default to match Ember
if (typeof this.value.ssl_version === 'undefined') {
this.$set(this.value, 'ssl_version', sslVersions[0]);
}
}

return { protocolOptions: protocol, sslVersions };
},
computed: {
port: {
get() {
return this.value.port;
},
set(port) {
updatePort(value => this.$set(this.value, 'port', value), port);
}
}
}
};
</script>

<template>
<div class="opensearch">
<div class="row">
<div class="col span-6">
<h3>{{ t('logging.output.sections.target') }}</h3>
</div>
</div>
<div class="row mb-10">
<div class="col span-2">
<LabeledSelect
v-model="value.scheme"
:mode="mode"
:disabled="disabled"
class="scheme"
:options="protocolOptions"
:label="t('logging.elasticsearch.scheme')"
/>
</div>
<div class="col span-8">
<LabeledInput
v-model="value.host"
:mode="mode"
:disabled="disabled"
class="host"
:label="t('logging.elasticsearch.host')"
/>
</div>
<div class="col span-2">
<LabeledInput
v-model.number="port"
:mode="mode"
:disabled="disabled"
class="port"
type="number"
min="1"
max="65535"
:label="t('logging.elasticsearch.port')"
/>
</div>
</div>
<div class="row">
<div class="col span-6">
<LabeledInput
v-model="value.index_name"
:mode="mode"
:disabled="disabled"
:label="t('logging.elasticsearch.indexName')"
/>
</div>
</div>
<div class="spacer" />
<div class="row">
<div class="col span-6">
<h3>{{ t('logging.output.sections.access') }}</h3>
</div>
</div>
<div class="row">
<div class="col span-6">
<LabeledInput
v-model="value.user"
:mode="mode"
:disabled="disabled"
:label="t('logging.elasticsearch.user')"
/>
</div>
<div class="col span-6">
<SecretSelector
v-model="value.password"
:secret-name-label="t('logging.elasticsearch.password')"
:mode="mode"
:namespace="namespace"
:disabled="disabled"
:show-key-selector="true"
/>
</div>
</div>
<div class="spacer" />
<div class="row">
<div class="col span-6">
<h3>{{ t('logging.output.sections.certificate') }}</h3>
</div>
</div>
<div class="row mb-10">
<div class="col span-6">
<SecretSelector
v-model="value.ca_file"
mount-key="mountFrom"
:mode="mode"
:namespace="namespace"
:disabled="disabled"
:secret-name-label="t('logging.elasticsearch.caFile.label')"
:show-key-selector="true"
/>
</div>
<div class="col span-6">
<SecretSelector
v-model="value.client_cert"
mount-key="mountFrom"
:mode="mode"
:namespace="namespace"
:disabled="disabled"
:secret-name-label="t('logging.elasticsearch.clientCert.label')"
:show-key-selector="true"
/>
</div>
</div>
<div class="row">
<div class="col span-6">
<SecretSelector
v-model="value.client_key"
mount-key="mountFrom"
:mode="mode"
:namespace="namespace"
:disabled="disabled"
:secret-name-label="t('logging.elasticsearch.clientKey.label')"
:show-key-selector="true"
/>
</div>
<div class="col span-6">
<SecretSelector
v-model="value.client_key_pass"
:mode="mode"
:namespace="namespace"
:disabled="disabled"
:secret-name-label="t('logging.elasticsearch.clientKeyPass')"
:show-key-selector="true"
/>
</div>
</div>
<div class="row mb-10">
<div class="col span-6 vertically-center">
<Checkbox
v-model="value.ssl_verify"
:label="t('logging.elasticsearch.verifySsl')"
:disabled="disabled"
:mode="mode"
/>
</div>
</div>
</div>
</template>
<style>
.row {
margin-bottom: 5px;
}
.vertically-center {
padding: 20px 0;
}
</style>
142 changes: 142 additions & 0 deletions shell/edit/logging.banzaicloud.io.output/providers/redis.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,142 @@
<script>
import { LabeledInput } from '@components/Form/LabeledInput';
import SecretSelector from '@shell/components/form/SecretSelector';
import { updatePort } from './utils';
import LabeledSelect from '@shell/components/form/LabeledSelect';

export default {
components: {
LabeledInput, LabeledSelect, SecretSelector
},
props: {
value: {
type: Object,
default: () => {
return {};
}
},
disabled: {
type: Boolean,
default: false
},
mode: {
type: String,
required: true,
},
namespace: {
type: String,
required: true
}
},
data() {
const formatTypeOptions = ['json', 'out_file', 'ltsv', 'csv', 'msgpack', 'hash', 'single_value'];

this.$set(this.value, 'format', this.value.format || { type: formatTypeOptions[0] });

return { formatTypeOptions };
},
computed: {
port: {
get() {
return this.value.port;
},
set(port) {
updatePort(value => this.$set(this.value, 'port', value), port);
}
}
}
};
</script>

<template>
<div class="opensearch">
<div class="row">
<div class="col span-6">
<h3>{{ t('logging.output.sections.target') }}</h3>
</div>
</div>
<div class="row mb-10">
<div class="col span-8">
<LabeledInput
v-model="value.host"
:mode="mode"
:disabled="disabled"
class="host"
:label="t('logging.redis.host')"
/>
</div>
<div class="col span-2">
<LabeledInput
v-model.number="port"
:mode="mode"
:disabled="disabled"
class="port"
type="number"
min="1"
max="65535"
:label="t('logging.redis.port')"
/>
</div>
</div>
<div class="row">
<div class="col span-6">
<LabeledInput
v-model.number="value.db_number"
:mode="mode"
:disabled="disabled"
type="number"
:label="t('logging.redis.dbNumber')"
/>
</div>
<div class="col span-6">
<LabeledInput
v-model.number="value.ttl"
:mode="mode"
:disabled="disabled"
type="number"
:label="t('logging.redis.ttl')"
/>
</div>
</div>
<div class="spacer" />
<div class="row">
<div class="col span-6">
<h3>{{ t('logging.redis.format.title') }}</h3>
</div>
</div>
<div class="row mb-10">
<div class="col span-6">
<LabeledSelect
v-model="value.format.type"
:options="formatTypeOptions"
:mode="mode"
:disabled="disabled"
:label="t('logging.redis.format.type')"
/>
</div>
</div>
<div class="spacer" />
<div class="row">
<div class="col span-6">
<h3>{{ t('logging.output.sections.access') }}</h3>
</div>
</div>
<div class="row">
<div class="col span-6">
<SecretSelector
v-model="value.password"
:secret-name-label="t('logging.elasticsearch.password')"
:mode="mode"
:namespace="namespace"
:disabled="disabled"
:show-key-selector="true"
/>
</div>
</div>
</div>
</template>
<style>
.row {
margin-bottom: 5px;
}
</style>
Loading