Skip to content

Commit 13fd20a

Browse files
author
Chris Wiechmann
committed
Updated a few settings
1 parent d26785c commit 13fd20a

File tree

2 files changed

+44
-10
lines changed

2 files changed

+44
-10
lines changed

helm/aws-eks/apim-elk-on-aws-eks-values.yaml

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,26 @@ apibuilder4elastic:
88
apimgrUsername: "apiadmin"
99
apimgrPassword: "axway123"
1010

11+
validateElasticsearchCertificate: "false"
12+
1113
apmserver:
1214
verifyServerCert: "false"
13-
# logLevel: debug
15+
logLevel: debug
16+
retentionPeriodConfig: "./config/my-retention-period.json"
17+
18+
extraVolumes:
19+
- name: retentionperiod
20+
configMap:
21+
name: retentionperiod
22+
23+
extraVolumeMounts:
24+
- name: retentionperiod
25+
mountPath: /app/config/
26+
1427
# Enable, if you would like to deploy a new Elasticsearch cluster for the solution
1528
elasticsearch:
1629
enabled: true
17-
imageTag: "7.16.2"
30+
# imageTag: "7.16.2"
1831
replicas: 3
1932
extraInitContainers: [] # To be removed on release after 3.2.0
2033
volumeClaimTemplate:
@@ -43,7 +56,8 @@ elasticsearch:
4356
# Enable, if you would like to deploy Kibana for the solution
4457
kibana:
4558
enabled: true
46-
imageTag: "7.16.2"
59+
# imageTag: "7.16.2"
60+
validateElasticsearchCertificate: "none"
4761
ingress:
4862
className: ""
4963
# Annotations used to expose Kibana on an AWS-ALB
@@ -73,8 +87,9 @@ kibana:
7387

7488
logstash:
7589
replicas: 2
76-
imageTag: "7.16.2"
90+
# imageTag: "7.16.2"
7791
logstashJavaOpts: "-Xmx6g -Xms6g"
92+
validateElasticsearchCertificate: "none"
7893
resources:
7994
requests:
8095
cpu: "2000m"
@@ -86,18 +101,24 @@ logstash:
86101
filebeat:
87102
# Only create the ConfigMaps which are used by Filebeat running along the API-Gateways as a side-car
88103
createFilebeatConfig: true
89-
imageTag: "7.16.2"
104+
# imageTag: "7.16.2"
90105

91106
elasticsearchClusterUUID: i1djDUVbTcKj2ySgf1PCmg
92107

108+
validateElasticsearchCertificate: "none"
109+
93110
filebeatSecrets:
94111
beatsSystemUsername: ""
95112

113+
compressionLevel: 9
114+
96115
apm-server:
97116
enabled: true
98117

99118
elasticsearchClusterUUID: i1djDUVbTcKj2ySgf1PCmg
100119

120+
validateElasticsearchCertificate: "none"
121+
101122
resources:
102123
requests:
103124
cpu: "100m"

helm/aws-eks/axway-apim-on-aws-eks-values.yaml

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ global:
44

55
domainName: "axway-apim-on-eks.de"
66
dockerRepository: "ghcr.io/cwiechmann/axway-api-management-automated"
7-
imageTag: "77-20211130-1-eed8beb"
7+
imageTag: "77-20211130-1-ae1a6bc"
88

99
##################################################################################################################################
1010
# A D M I N - N O D E M A N A G E R
@@ -37,7 +37,7 @@ anm:
3737
##################################################################################################################################
3838
apimgr:
3939
enabled: true
40-
imageTag: 77-20211130-v1-eed8beb
40+
imageTag: 77-20211130-v1-780fff6
4141
ingress:
4242
enabled: true
4343
annotations:
@@ -56,7 +56,8 @@ apimgr:
5656
##################################################################################################################################
5757
apitraffic:
5858
enabled: true
59-
imageTag: 77-20211130-v1-eed8beb
59+
imageTag: 77-20211130-v1-780fff6
60+
domainName: xxx.com
6061
ingress:
6162
enabled: true
6263
name: traffic
@@ -84,7 +85,7 @@ apitraffic:
8485

8586
extraContainers:
8687
- name: filebeat
87-
image: docker.elastic.co/beats/filebeat:7.16.1
88+
image: docker.elastic.co/beats/filebeat:7.16.3
8889
envFrom:
8990
- configMapRef:
9091
name: axway-elk-apim4elastic-filebeat-env-config
@@ -154,6 +155,10 @@ cassandra:
154155
cpu: 2
155156
memory: 2Gi
156157

158+
metrics:
159+
# Start a side-car prometheus exporter
160+
enabled: true
161+
157162
##################################################################################################################################
158163
# INTERNAL ANALYTICS/METRICS DATABASE
159164
##################################################################################################################################
@@ -165,6 +170,8 @@ mysqlmetrics:
165170
##################################################################################################################################
166171
mysqlapiportal:
167172
internal: true
173+
image:
174+
debug: true
168175

169176
##################################################################################################################################
170177
# AMPLIFY AGENTS
@@ -217,4 +224,10 @@ pvcs:
217224
enabled: false
218225
audit:
219226
# Not using a persistent volume as Filebeat runs as a sidecar
220-
enabled: false
227+
enabled: false
228+
229+
apiportalDbVolumeClaim:
230+
accessModes: [ "ReadWriteOnce" ]
231+
resources:
232+
requests:
233+
storage: 2Gi

0 commit comments

Comments
 (0)