Skip to content

Commit

Permalink
Formatting fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@sky333999
sky333999 committed Dec 18, 2024
1 parent b80971d commit cce0aac
Showing 1 changed file with 25 additions and 29 deletions.
54 changes: 25 additions & 29 deletions charts/amazon-cloudwatch-observability/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ containerLogs:
requests:
cpu: 50m
memory: 25Mi
priorityClassName: "system-node-critical"
priorityClassName: system-node-critical
config:
service: |
[SERVICE]
Expand All @@ -204,14 +204,14 @@ containerLogs:
Regex ^(?<time>[^ ]* {1,2}[^ ]* [^ ]*) (?<host>[^ ]*) (?<ident>[a-zA-Z0-9_\/\.\-]*)(?:\[(?<pid>[0-9]+)\])?(?:[^\:]*\:)? *(?<message>.*)$
Time_Key time
Time_Format %b %d %H:%M:%S
[PARSER]
Name container_firstline
Format regex
Regex (?<log>(?<="log":")\S(?!\.).*?)(?<!\\)".*(?<stream>(?<="stream":").*?)".*(?<time>\d{4}-\d{1,2}-\d{1,2}T\d{2}:\d{2}:\d{2}\.\w*).*(?=})
Time_Key time
Time_Format %Y-%m-%dT%H:%M:%S.%LZ
[PARSER]
Name cwagent_firstline
Format regex
Expand All @@ -233,7 +233,7 @@ containerLogs:
Rotate_Wait 30
storage.type filesystem
Read_from_Head ${READ_FROM_HEAD}
[INPUT]
Name tail
Tag application.*
Expand All @@ -244,7 +244,7 @@ containerLogs:
Skip_Long_Lines On
Refresh_Interval 10
Read_from_Head ${READ_FROM_HEAD}
[INPUT]
Name tail
Tag application.*
Expand All @@ -255,14 +255,14 @@ containerLogs:
Skip_Long_Lines On
Refresh_Interval 10
Read_from_Head ${READ_FROM_HEAD}
[FILTER]
Name aws
Match application.*
az false
ec2_instance_id false
Enable_Entity true
[FILTER]
Name kubernetes
Match application.*
Expand All @@ -278,7 +278,7 @@ containerLogs:
Kubelet_Port 10250
Buffer_Size 0
Use_Pod_Association On
[OUTPUT]
Name cloudwatch_logs
Match application.*
Expand All @@ -298,7 +298,7 @@ containerLogs:
DB /var/fluent-bit/state/systemd.db
Path /var/log/journal
Read_From_Tail ${READ_FROM_TAIL}
[INPUT]
Name tail
Tag dataplane.tail.*
Expand All @@ -311,20 +311,20 @@ containerLogs:
Rotate_Wait 30
storage.type filesystem
Read_from_Head ${READ_FROM_HEAD}
[FILTER]
Name modify
Match dataplane.systemd.*
Rename _HOSTNAME hostname
Rename _SYSTEMD_UNIT systemd_unit
Rename MESSAGE message
Remove_regex ^((?!hostname|systemd_unit|message).)*$
[FILTER]
Name aws
Match dataplane.*
imds_version v2
[OUTPUT]
Name cloudwatch_logs
Match dataplane.*
Expand Down Expand Up @@ -1012,7 +1012,7 @@ containerLogs:
Daemon off
net.dns.resolver LEGACY
Parsers_File parsers.conf
@INCLUDE application-log.conf
@INCLUDE dataplane-log.conf
@INCLUDE host-log.conf
Expand All @@ -1022,14 +1022,14 @@ containerLogs:
Format json
Time_Key time
Time_Format %b %d %H:%M:%S
[PARSER]
Name container_firstline
Format regex
Regex (?<log>(?<="log":")\S(?!\.).*?)(?<!\\)".*(?<stream>(?<="stream":").*?)".*(?<time>\d{4}-\d{1,2}-\d{1,2}T\d{2}:\d{2}:\d{2}\.\w*).*(?=})
Time_Key time
Time_Format %Y-%m-%dT%H:%M:%S.%LZ
[PARSER]
Name dataplane_firstline
Format regex
Expand All @@ -1050,7 +1050,7 @@ containerLogs:
Rotate_Wait 30
Refresh_Interval 10
Read_from_Head ${READ_FROM_HEAD}
[INPUT]
Name tail
Tag application.*
Expand All @@ -1062,7 +1062,7 @@ containerLogs:
Rotate_Wait 30
Refresh_Interval 10
Read_from_Head ${READ_FROM_HEAD}
[INPUT]
Name tail
Tag application.*
Expand All @@ -1074,7 +1074,7 @@ containerLogs:
Rotate_Wait 30
Refresh_Interval 10
Read_from_Head ${READ_FROM_HEAD}
[OUTPUT]
Name cloudwatch_logs
Match application.*
Expand All @@ -1095,7 +1095,7 @@ containerLogs:
Rotate_Wait 30
Refresh_Interval 10
Read_from_Head ${READ_FROM_HEAD}
[INPUT]
Name tail
Tag dataplane.tail.C.ProgramData.Amazon.EKS.logs.vpc-bridge
Expand All @@ -1114,7 +1114,7 @@ containerLogs:
Channels EKS
DB C:\\var\\fluent-bit\\state\\flb_eks_winlog.db
Interval_Sec 60
[FILTER]
Name aws
Match dataplane.*
Expand All @@ -1124,7 +1124,7 @@ containerLogs:
Name aws
Match winlog.*
imds_version v2
[OUTPUT]
Name cloudwatch_logs
Match dataplane.*
Expand All @@ -1148,12 +1148,12 @@ containerLogs:
Channels System
DB C:\\var\\fluent-bit\\state\\flb_system_winlog.db
Interval_Sec 60
[FILTER]
Name aws
Match winlog.*
imds_version v2
[OUTPUT]
Name cloudwatch_logs
Match winlog.*
Expand All @@ -1162,7 +1162,6 @@ containerLogs:
log_stream_name ${HOST_NAME}.windows.system.events
auto_create_group true
extra_user_agent container-insights
## Provide CloudWatchAgent Operator manager container image and resources.
##
manager:
Expand Down Expand Up @@ -1311,11 +1310,9 @@ admissionWebhooks:
secretAnnotations: {}
## Secret labels
secretLabels: {}

## 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.
agents:
- name: cloudwatch-agent

agent:
name:
mode: # represents the mode the cloudwatch-agent will run in (deployment, daemonset or statefulset)
Expand All @@ -1330,7 +1327,7 @@ agent:
us-gov-east-1: 743662458514.dkr.ecr.us-gov-east-1.amazonaws.com
us-gov-west-1: 743662458514.dkr.ecr.us-gov-west-1.amazonaws.com
enabled: true
priorityClassName: "system-node-critical"
priorityClassName: system-node-critical
resources:
requests:
memory: 128Mi
Expand Down Expand Up @@ -1391,7 +1388,6 @@ agent:
us-gov-west-1: 743662458514.dkr.ecr.us-gov-west-1.amazonaws.com
prometheusCR:
enabled: false

dcgmExporter:
name:
image:
Expand Down Expand Up @@ -1448,4 +1444,4 @@ neuronMonitor:
add:
- SYS_ADMIN
serviceAccount:
name: # override exporter service account name
name: # override exporter service account name

0 comments on commit cce0aac

Please sign in to comment.