Skip to content

Commit 2660bc3

Browse files
committed
Further configuration
1 parent af0848f commit 2660bc3

File tree

5 files changed

+101
-7
lines changed

5 files changed

+101
-7
lines changed

charts/aws-ebs-csi-driver/values.yaml.gotmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ image:
55
tag: "v1.38.1"
66

77
storageClasses:
8-
- name: "ebs-sc"
8+
- name: "{{ .Values.ebsStorageClassName }}"
99
parameters:
1010
type: "gp3"
1111
allowVolumeExpansion: true

charts/elastic-stack/values.yaml.gotmpl

Lines changed: 63 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
1+
# App-level settings (e.g. elasticsearch, kibana)
2+
13
# https://github.com/elastic/cloud-on-k8s/blob/3.0/deploy/eck-stack/charts/eck-elasticsearch/values.yaml
4+
25
eck-elasticsearch:
6+
# access internally over plain http
7+
http:
8+
tls:
9+
selfSignedCertificate:
10+
disabled: true
311
nodeSets:
412
- name: default
513
count: 1
@@ -16,11 +24,12 @@ eck-elasticsearch:
1624
resources:
1725
requests:
1826
storage: 20Gi
19-
storageClassName:
27+
storageClassName: "{{ .Values.ebsStorageClassName }}"
28+
2029
podTemplate:
21-
nodeSelector:
22-
ops: true
2330
spec:
31+
nodeSelector:
32+
ops: "true"
2433
containers:
2534
- name: elasticsearch
2635

@@ -36,4 +45,54 @@ eck-elasticsearch:
3645
memory: 2Gi
3746
requests:
3847
cpu: 0.5
39-
memory: 512Mi
48+
memory: 2Gi
49+
50+
# https://github.com/elastic/cloud-on-k8s/blob/3.0/deploy/eck-stack/charts/eck-kibana/values.yaml
51+
52+
eck-kibana:
53+
count: 1
54+
podTemplate:
55+
spec:
56+
nodeSelector:
57+
ops: "true"
58+
containers:
59+
- name: kibana
60+
env:
61+
# https://discuss.elastic.co/t/ingress-for-kibana-dashboard-when-using-kubernetes-traefik/198236
62+
- name: "SERVER_BASEPATH"
63+
value: "/kibana"
64+
- name: "SERVER_REWRITEBASEPATH"
65+
value: "true"
66+
- name: "SERVER_PUBLICBASEURL"
67+
value: "https://{{ requiredEnv "K8S_MONITORING_FQDN" }}/kibana"
68+
resources:
69+
requests:
70+
memory: 1Gi
71+
cpu: 0.5
72+
limits:
73+
memory: 1Gi
74+
cpu: 1
75+
# tls fails if this is not disabled
76+
# https://github.com/elastic/cloud-on-k8s/issues/2118#issuecomment-558981590
77+
http:
78+
tls:
79+
selfSignedCertificate:
80+
disabled: true
81+
# https://github.com/elastic/cloud-on-k8s/blob/3.0/deploy/eck-stack/charts/eck-kibana/templates/ingress.yaml
82+
ingress:
83+
annotations:
84+
# kibana has built-in auth support
85+
# kibana can be configured to be served from a /kibana path (no strip middleware needed)
86+
namespace: {{ .Release.Namespace }}
87+
cert-manager.io/cluster-issuer: "cert-issuer"
88+
traefik.ingress.kubernetes.io/router.entrypoints: websecure
89+
enabled: true
90+
tls:
91+
enabled: true
92+
hosts:
93+
- {{ requiredEnv "K8S_MONITORING_FQDN" }}
94+
secretName: monitoring-tls
95+
hosts:
96+
- host: {{ requiredEnv "K8S_MONITORING_FQDN" }}
97+
path: /kibana
98+
pathType: Prefix
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
persistence:
22
enabled: true
33
size: "1Gi" # minimal size for gp3 is 1Gi
4-
storageClass: "ebs-sc"
4+
storageClass: "{{ .Values.ebsStorageClassName }}"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
persistence:
22
enabled: true
33
size: "300Mi" # cannot be lower https://github.com/longhorn/longhorn/issues/8488
4-
storageClass: "{{.Values.longhornStorageClassName}}"
4+
storageClass: "{{ .Values.longhornStorageClassName }}"

charts/vector/values.yaml.gotmpl

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
role: "Agent"
2+
3+
env:
4+
- name: ELASTICSEARCH_USERNAME
5+
value: &elasticsearch_username lastic
6+
- name: ELASTICSEARCH_PASSWORD
7+
valueFrom:
8+
secretKeyRef:
9+
name: elasticsearch-es-elastic-user
10+
key: *elasticsearch_username
11+
12+
customConfig:
13+
dataDir: /vector-data-dir
14+
15+
sources:
16+
kubernetes_logs:
17+
type: kubernetes_logs
18+
19+
sinks:
20+
es_out:
21+
type: elasticsearch
22+
inputs: ["kubernetes_logs"]
23+
endpoint: "http://your-elasticsearch-cluster:9200"
24+
auth:
25+
username: "${ELASTICSEARCH_USERNAME}"
26+
password: "${ELASTICSEARCH_PASSWORD}"
27+
index: "vector-k8s-%F"
28+
29+
resources:
30+
requests:
31+
cpu: 200m
32+
memory: 256Mi
33+
limits:
34+
cpu: 200m
35+
memory: 256Mi

0 commit comments

Comments
 (0)