Bitnami/charts
2
0
Fork 0
mirror of https://github.com/bitnami/charts.git synced 2026-08-10 14:15:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

[bitnami/logstash] Add extra inputs and ports to pod and svc (#27763)

Browse Source
This commit is contained in:
Max Nitze
2024-08-01 15:45:35 +02:00
committed by GitHub
parent 2ee572c551
commit e4cc1380c8
8 changed files with 60 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.vib/logstash/runtime-parameters.yaml
+1 -3
View File
@@ -25,9 +25,6 @@ containerPorts:
- name: http
containerPort: 8081
protocol: TCP
- name: monitoring
containerPort: 9600
protocol: TCP
replicaCount: 1
podSecurityContext:
enabled: true
@@ -41,6 +38,7 @@ service:
port: 8081
targetPort: http
protocol: TCP
extraPorts:
- name: monitoring
port: 80
targetPort: monitoring
bitnami/logstash/CHANGELOG.md
+6 -2
View File
@@ -1,8 +1,12 @@
# Changelog
## 6.2.14 (2024-07-25)
## 6.3.0 (2024-08-01)
* [bitnami/logstash] Release 6.2.14 ([#28445](https://github.com/bitnami/charts/pull/28445))
* [bitnami/logstash] Add extra inputs and ports to pod and svc ([#27763](https://github.com/bitnami/charts/pull/27763))
## <small>6.2.14 (2024-07-25)</small>
* [bitnami/logstash] Release 6.2.14 (#28445) ([75944e6](https://github.com/bitnami/charts/commit/75944e6df9e9672dec0c0f462ec5b3bb73fc9e39)), closes [#28445](https://github.com/bitnami/charts/issues/28445)
## <small>6.2.13 (2024-07-24)</small>
bitnami/logstash/Chart.yaml
+1 -1
View File
@@ -30,4 +30,4 @@ maintainers:
name: logstash
sources:
- https://github.com/bitnami/charts/tree/main/bitnami/logstash
version: 6.2.14
version: 6.3.0
bitnami/logstash/README.md
+3
View File
@@ -202,6 +202,7 @@ See the [Parameters](#parameters) section to configure the PVC or to disable per
| `extraEnvVarsSecret` | To add secrets to environment | `""` |
| `extraEnvVarsCM` | To add configmaps to environment | `""` |
| `input` | Input Plugins configuration | `""` |
| `extraInput` | Extra Input Plugins configuration | `""` |
| `filter` | Filter Plugins configuration | `""` |
| `output` | Output Plugins configuration | `""` |
| `existingConfiguration` | Name of existing ConfigMap object with the Logstash configuration (`input`, `filter`, and `output` will be ignored). | `""` |
@@ -214,6 +215,7 @@ See the [Parameters](#parameters) section to configure the PVC or to disable per
| `serviceAccount.automountServiceAccountToken` | Allows automount of ServiceAccountToken on the serviceAccount created | `false` |
| `serviceAccount.annotations` | Additional custom annotations for the ServiceAccount | `{}` |
| `containerPorts` | Array containing the ports to open in the Logstash container (evaluated as a template) | `[]` |
| `extraContainerPorts` | Array containing extra ports to open in the Logstash container (evaluated as a template) | `[]` |
| `initContainers` | Add additional init containers to the Logstash pod(s) | `[]` |
| `sidecars` | Add additional sidecar containers to the Logstash pod(s) | `[]` |
| `replicaCount` | Number of Logstash replicas to deploy | `1` |
@@ -276,6 +278,7 @@ See the [Parameters](#parameters) section to configure the PVC or to disable per
| `customReadinessProbe` | Custom readiness probe for the Web component | `{}` |
| `service.type` | Kubernetes service type (`ClusterIP`, `NodePort`, or `LoadBalancer`) | `ClusterIP` |
| `service.ports` | Logstash service ports (evaluated as a template) | `[]` |
| `service.extraPorts` | Extra Logstash service ports (evaluated as a template) | `[]` |
| `service.loadBalancerIP` | loadBalancerIP if service type is `LoadBalancer` | `""` |
| `service.loadBalancerSourceRanges` | Addresses that are allowed when service is LoadBalancer | `[]` |
| `service.externalTrafficPolicy` | External traffic policy, configure to Local to preserve client source IP when using an external loadBalancer | `""` |
bitnami/logstash/templates/configuration-cm.yaml
+3 -2
View File
@@ -3,7 +3,7 @@ Copyright Broadcom, Inc. All Rights Reserved.
SPDX-License-Identifier: APACHE-2.0
*/}}
{{ if and (or .Values.input .Values.filter .Values.output .Values.extraConfigurationFiles) (not .Values.existingConfiguration) }}
{{ if and (or .Values.input .Values.extraInput .Values.filter .Values.output .Values.extraConfigurationFiles) (not .Values.existingConfiguration) }}
apiVersion: v1
kind: ConfigMap
metadata:
@@ -16,9 +16,10 @@ metadata:
data:
{{- if (or .Values.input .Values.filter .Values.output) }}
logstash.conf: |-
{{- if .Values.input }}
{{- if or .Values.input .Values.extraInput }}
input {
{{- include "common.tplvalues.render" (dict "value" .Values.input "context" $) | nindent 6 }}
{{- include "common.tplvalues.render" (dict "value" .Values.extraInput "context" $) | nindent 6 }}
}
{{- end }}
{{- if .Values.filter }}
bitnami/logstash/templates/sts.yaml
+13 -2
View File
@@ -140,8 +140,19 @@ spec:
- secretRef:
name: {{ .Values.extraEnvVarsSecret }}
{{- end }}
{{- if .Values.containerPorts }}
ports: {{ toYaml .Values.containerPorts | nindent 12 }}
{{- if or .Values.containerPorts .Values.extraContainerPorts .Values.enableMonitoringAPI }}
ports:
{{- if .Values.containerPorts }}
{{- include "common.tplvalues.render" (dict "value" .Values.containerPorts "context" $) | nindent 12 }}
{{- end }}
{{- if .Values.extraContainerPorts }}
{{- include "common.tplvalues.render" (dict "value" .Values.extraContainerPorts "context" $) | nindent 12 }}
{{- end }}
{{- if .Values.enableMonitoringAPI }}
- name: monitoring
containerPort: {{ .Values.monitoringAPIPort }}
protocol: TCP
{{- end }}
{{- end }}
{{- if not .Values.diagnosticMode.enabled }}
{{- if .Values.customLivenessProbe }}
bitnami/logstash/templates/svc.yaml
+7
View File
@@ -33,7 +33,14 @@ spec:
{{- if .Values.service.sessionAffinityConfig }}
sessionAffinityConfig: {{- include "common.tplvalues.render" (dict "value" .Values.service.sessionAffinityConfig "context" $) | nindent 4 }}
{{- end }}
{{- if or .Values.service.ports .Values.service.extraPorts }}
ports:
{{- if .Values.service.ports }}
{{- include "common.tplvalues.render" (dict "value" .Values.service.ports "context" $) | nindent 4 }}
{{- end }}
{{- if .Values.service.extraPorts }}
{{- include "common.tplvalues.render" (dict "value" .Values.service.extraPorts "context" $) | nindent 4 }}
{{- end }}
{{- end }}
{{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.podLabels .Values.commonLabels ) "context" . ) }}
selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }}
bitnami/logstash/values.yaml
+26 -3
View File
@@ -139,6 +139,10 @@ input: |-
# type => syslog
# }
http { port => 8080 }
## @param extraInput [string] Extra Input Plugins configuration
## ref: https://www.elastic.co/guide/en/logstash/current/input-plugins.html
##
extraInput: ""
## @param filter Filter Plugins configuration
## ref: https://www.elastic.co/guide/en/logstash/current/filter-plugins.html
## e.g:
@@ -220,9 +224,6 @@ containerPorts:
- name: http
containerPort: 8080
protocol: TCP
- name: monitoring
containerPort: 9600
protocol: TCP
## - name: syslog-udp
## containerPort: 1514
## protocol: UDP
@@ -230,6 +231,16 @@ containerPorts:
## containerPort: 1514
## protocol: TCP
##
## @param extraContainerPorts [array] Array containing extra ports to open in the Logstash container (evaluated as a template)
##
extraContainerPorts: []
## - name: syslog-udp
## containerPort: 1514
## protocol: UDP
## - name: syslog-tcp
## containerPort: 1514
## protocol: TCP
##
## @param initContainers Add additional init containers to the Logstash pod(s)
## ref: https://kubernetes.io/docs/concepts/workloads/pods/init-containers/
## e.g:
@@ -474,6 +485,18 @@ service:
## targetPort: syslog-tcp
## protocol: TCP
##
## @param service.extraPorts [array] Extra Logstash service ports (evaluated as a template)
##
extraPorts: []
## - name: syslog-udp
## port: 1514
## targetPort: syslog-udp
## protocol: UDP
## - name: syslog-tcp
## port: 1514
## targetPort: syslog-tcp
## protocol: TCP
##
## @param service.loadBalancerIP loadBalancerIP if service type is `LoadBalancer`
##
loadBalancerIP: ""