Skip to content

Commit 40f269d

Browse files
sky333999sky333999
authored
Increment CWAOperator version and minor formatting fixes (#146)
1 parent 542b35e commit 40f269d

File tree

2 files changed

+27
-31
lines changed

2 files changed

+27
-31
lines changed

‎charts/amazon-cloudwatch-observability/templates/linux/cloudwatch-agent-custom-resource.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
{{- range $i, $customAgent := .Values.agents }}
55
{{ $altNames = append $altNames ( printf "%s-target-allocator-service" $customAgent.name )}}
66
{{- end }}
7-
{{- $agentAltNames := list ( printf "%s" (include "cloudwatch-agent.name" .) ) ( printf "%s.%s.svc" (include "cloudwatch-agent.name" .) .Release.Namespace ) -}}
7+
{{- $agentAltNames := list ( printf "%s" (include "cloudwatch-agent.name" .) ) ( printf "%s.%s.svc" (include "cloudwatch-agent.name" .) .Release.Namespace ) -}}
88
{{- $ca := genCA ("agent-ca") ( .Values.agent.autoGenerateCert.expiryDays | int ) -}}
99
{{- $cert := genSignedCert ("agent") nil $altNames ( .Values.admissionWebhooks.autoGenerateCert.expiryDays | int ) $ca -}}
1010
{{- $serverCert := genSignedCert ("agent-server") nil $agentAltNames ( .Values.admissionWebhooks.autoGenerateCert.expiryDays | int ) $ca -}}

‎charts/amazon-cloudwatch-observability/values.yaml

+26-30
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ containerLogs:
184184
requests:
185185
cpu: 50m
186186
memory: 25Mi
187-
priorityClassName: "system-node-critical"
187+
priorityClassName: system-node-critical
188188
config:
189189
service: |
190190
[SERVICE]
@@ -204,14 +204,14 @@ containerLogs:
204204
Regex ^(?<time>[^ ]* {1,2}[^ ]* [^ ]*) (?<host>[^ ]*) (?<ident>[a-zA-Z0-9_\/\.\-]*)(?:\[(?<pid>[0-9]+)\])?(?:[^\:]*\:)? *(?<message>.*)$
205205
Time_Key time
206206
Time_Format %b %d %H:%M:%S
207-
207+
208208
[PARSER]
209209
Name container_firstline
210210
Format regex
211211
Regex (?<log>(?<="log":")\S(?!\.).*?)(?<!\\)".*(?<stream>(?<="stream":").*?)".*(?<time>\d{4}-\d{1,2}-\d{1,2}T\d{2}:\d{2}:\d{2}\.\w*).*(?=})
212212
Time_Key time
213213
Time_Format %Y-%m-%dT%H:%M:%S.%LZ
214-
214+
215215
[PARSER]
216216
Name cwagent_firstline
217217
Format regex
@@ -233,7 +233,7 @@ containerLogs:
233233
Rotate_Wait 30
234234
storage.type filesystem
235235
Read_from_Head ${READ_FROM_HEAD}
236-
236+
237237
[INPUT]
238238
Name tail
239239
Tag application.*
@@ -244,7 +244,7 @@ containerLogs:
244244
Skip_Long_Lines On
245245
Refresh_Interval 10
246246
Read_from_Head ${READ_FROM_HEAD}
247-
247+
248248
[INPUT]
249249
Name tail
250250
Tag application.*
@@ -255,14 +255,14 @@ containerLogs:
255255
Skip_Long_Lines On
256256
Refresh_Interval 10
257257
Read_from_Head ${READ_FROM_HEAD}
258-
258+
259259
[FILTER]
260260
Name aws
261261
Match application.*
262262
az false
263263
ec2_instance_id false
264264
Enable_Entity true
265-
265+
266266
[FILTER]
267267
Name kubernetes
268268
Match application.*
@@ -278,7 +278,7 @@ containerLogs:
278278
Kubelet_Port 10250
279279
Buffer_Size 0
280280
Use_Pod_Association On
281-
281+
282282
[OUTPUT]
283283
Name cloudwatch_logs
284284
Match application.*
@@ -298,7 +298,7 @@ containerLogs:
298298
DB /var/fluent-bit/state/systemd.db
299299
Path /var/log/journal
300300
Read_From_Tail ${READ_FROM_TAIL}
301-
301+
302302
[INPUT]
303303
Name tail
304304
Tag dataplane.tail.*
@@ -311,20 +311,20 @@ containerLogs:
311311
Rotate_Wait 30
312312
storage.type filesystem
313313
Read_from_Head ${READ_FROM_HEAD}
314-
314+
315315
[FILTER]
316316
Name modify
317317
Match dataplane.systemd.*
318318
Rename _HOSTNAME hostname
319319
Rename _SYSTEMD_UNIT systemd_unit
320320
Rename MESSAGE message
321321
Remove_regex ^((?!hostname|systemd_unit|message).)*$
322-
322+
323323
[FILTER]
324324
Name aws
325325
Match dataplane.*
326326
imds_version v2
327-
327+
328328
[OUTPUT]
329329
Name cloudwatch_logs
330330
Match dataplane.*
@@ -1012,7 +1012,7 @@ containerLogs:
10121012
Daemon off
10131013
net.dns.resolver LEGACY
10141014
Parsers_File parsers.conf
1015-
1015+
10161016
@INCLUDE application-log.conf
10171017
@INCLUDE dataplane-log.conf
10181018
@INCLUDE host-log.conf
@@ -1022,14 +1022,14 @@ containerLogs:
10221022
Format json
10231023
Time_Key time
10241024
Time_Format %b %d %H:%M:%S
1025-
1025+
10261026
[PARSER]
10271027
Name container_firstline
10281028
Format regex
10291029
Regex (?<log>(?<="log":")\S(?!\.).*?)(?<!\\)".*(?<stream>(?<="stream":").*?)".*(?<time>\d{4}-\d{1,2}-\d{1,2}T\d{2}:\d{2}:\d{2}\.\w*).*(?=})
10301030
Time_Key time
10311031
Time_Format %Y-%m-%dT%H:%M:%S.%LZ
1032-
1032+
10331033
[PARSER]
10341034
Name dataplane_firstline
10351035
Format regex
@@ -1050,7 +1050,7 @@ containerLogs:
10501050
Rotate_Wait 30
10511051
Refresh_Interval 10
10521052
Read_from_Head ${READ_FROM_HEAD}
1053-
1053+
10541054
[INPUT]
10551055
Name tail
10561056
Tag application.*
@@ -1062,7 +1062,7 @@ containerLogs:
10621062
Rotate_Wait 30
10631063
Refresh_Interval 10
10641064
Read_from_Head ${READ_FROM_HEAD}
1065-
1065+
10661066
[INPUT]
10671067
Name tail
10681068
Tag application.*
@@ -1074,7 +1074,7 @@ containerLogs:
10741074
Rotate_Wait 30
10751075
Refresh_Interval 10
10761076
Read_from_Head ${READ_FROM_HEAD}
1077-
1077+
10781078
[OUTPUT]
10791079
Name cloudwatch_logs
10801080
Match application.*
@@ -1095,7 +1095,7 @@ containerLogs:
10951095
Rotate_Wait 30
10961096
Refresh_Interval 10
10971097
Read_from_Head ${READ_FROM_HEAD}
1098-
1098+
10991099
[INPUT]
11001100
Name tail
11011101
Tag dataplane.tail.C.ProgramData.Amazon.EKS.logs.vpc-bridge
@@ -1114,7 +1114,7 @@ containerLogs:
11141114
Channels EKS
11151115
DB C:\\var\\fluent-bit\\state\\flb_eks_winlog.db
11161116
Interval_Sec 60
1117-
1117+
11181118
[FILTER]
11191119
Name aws
11201120
Match dataplane.*
@@ -1124,7 +1124,7 @@ containerLogs:
11241124
Name aws
11251125
Match winlog.*
11261126
imds_version v2
1127-
1127+
11281128
[OUTPUT]
11291129
Name cloudwatch_logs
11301130
Match dataplane.*
@@ -1148,12 +1148,12 @@ containerLogs:
11481148
Channels System
11491149
DB C:\\var\\fluent-bit\\state\\flb_system_winlog.db
11501150
Interval_Sec 60
1151-
1151+
11521152
[FILTER]
11531153
Name aws
11541154
Match winlog.*
11551155
imds_version v2
1156-
1156+
11571157
[OUTPUT]
11581158
Name cloudwatch_logs
11591159
Match winlog.*
@@ -1162,14 +1162,13 @@ containerLogs:
11621162
log_stream_name ${HOST_NAME}.windows.system.events
11631163
auto_create_group true
11641164
extra_user_agent container-insights
1165-
11661165
## Provide CloudWatchAgent Operator manager container image and resources.
11671166
##
11681167
manager:
11691168
name:
11701169
image:
11711170
repository: cloudwatch-agent-operator
1172-
tag: 2.0.0
1171+
tag: 2.0.1
11731172
repositoryDomainMap:
11741173
public: public.ecr.aws/cloudwatch-agent
11751174
cn-north-1: 934860584483.dkr.ecr.cn-north-1.amazonaws.com.cn
@@ -1311,11 +1310,9 @@ admissionWebhooks:
13111310
secretAnnotations: {}
13121311
## Secret labels
13131312
secretLabels: {}
1314-
13151313
## List of AmazonCloudWatchAgent workloads to install & manage, each representing an independent installation of the AmazonCloudWatchAgent CustomResource. Each entry in this list uses the schema & the defaults from $.agent, so only provide any overrides here.
13161314
agents:
13171315
- name: cloudwatch-agent
1318-
13191316
agent:
13201317
name:
13211318
mode: # represents the mode the cloudwatch-agent will run in (deployment, daemonset or statefulset)
@@ -1330,7 +1327,7 @@ agent:
13301327
us-gov-east-1: 743662458514.dkr.ecr.us-gov-east-1.amazonaws.com
13311328
us-gov-west-1: 743662458514.dkr.ecr.us-gov-west-1.amazonaws.com
13321329
enabled: true
1333-
priorityClassName: "system-node-critical"
1330+
priorityClassName: system-node-critical
13341331
resources:
13351332
requests:
13361333
memory: 128Mi
@@ -1391,7 +1388,6 @@ agent:
13911388
us-gov-west-1: 743662458514.dkr.ecr.us-gov-west-1.amazonaws.com
13921389
prometheusCR:
13931390
enabled: false
1394-
13951391
dcgmExporter:
13961392
name:
13971393
image:
@@ -1448,4 +1444,4 @@ neuronMonitor:
14481444
add:
14491445
- SYS_ADMIN
14501446
serviceAccount:
1451-
name: # override exporter service account name
1447+
name: # override exporter service account name

0 commit comments

Comments
 (0)