Skip to content

Commit 9364a57

Browse files
authored
feat: Fix log/metrics endpoints when fips enabled (#14)
* feat: Fix log/metrics endpoints when fips enabled * npm audit fix
1 parent 56544a1 commit 9364a57

File tree

4 files changed

+16
-15
lines changed

4 files changed

+16
-15
lines changed

source/lib/config/user_data/common_user_data

+2
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@ echo " >>druid>> starting CloudWatch agent $(date)"
7070
sed -i \
7171
-e "s|<DRUID_COMPONENT>|{{DRUID_COMPONENT}}|g" \
7272
-e "s|<DRUID_CLUSTER_NAME>|{{DRUID_CLUSTER_NAME}}|g" \
73+
-e "s|<AWS_REGION>|$AWS_REGION|g" \
74+
-e "s|<FIPS_ENDPOINT>|$($AWS_USE_FIPS_ENDPOINT && echo -fips)|g" \
7375
$DRUID_SOLUTION_CONFIG/cloudwatch-agent/amazon-cloudwatch-agent.json
7476
/opt/aws/amazon-cloudwatch-agent/bin/amazon-cloudwatch-agent-ctl -a fetch-config -m ec2 -s -c file:$DRUID_SOLUTION_CONFIG/cloudwatch-agent/amazon-cloudwatch-agent.json
7577

source/lib/config/user_data/zookeeper_user_data

+6-3
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,14 @@ mv apache-zookeeper-{{ZK_VERSION}}-bin apache-zookeeper
5656

5757
# Configure CloudWatch agent
5858
aws s3 cp s3://{{S3_INSTALLATION_BUCKET}}/config/cloudwatch-agent/amazon-cloudwatch-agent.json /opt/aws/amazon-cloudwatch-agent/etc/
59-
sed -i "s|<DRUID_COMPONENT>|zookeeper|g" /opt/aws/amazon-cloudwatch-agent/etc/amazon-cloudwatch-agent.json
60-
sed -i "s|<DRUID_CLUSTER_NAME>|{{DRUID_CLUSTER_NAME}}|g" /opt/aws/amazon-cloudwatch-agent/etc/amazon-cloudwatch-agent.json
6159

62-
# Start CloudWatch agent
6360
echo " >>zookeeper>> starting CloudWatch agent $(date)"
61+
sed -i \
62+
-e "s|<DRUID_COMPONENT>|zookeeper|g" \
63+
-e "s|<DRUID_CLUSTER_NAME>|{{DRUID_CLUSTER_NAME}}|g" \
64+
-e "s|<AWS_REGION>|$AWS_REGION|g" \
65+
-e "s|<FIPS_ENDPOINT>|$($AWS_USE_FIPS_ENDPOINT && echo -fips)|g" \
66+
/opt/aws/amazon-cloudwatch-agent/etc/amazon-cloudwatch-agent.json
6467
/opt/aws/amazon-cloudwatch-agent/bin/amazon-cloudwatch-agent-ctl -a fetch-config -m ec2 -s -c file:/opt/aws/amazon-cloudwatch-agent/etc/amazon-cloudwatch-agent.json
6568

6669
# Configure Zookeeper

source/lib/uploads/config/cloudwatch-agent/amazon-cloudwatch-agent.json

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"agent": { "metrics_collection_interval": 60 },
33
"metrics": {
4+
"endpoint_override": "https://monitoring<FIPS_ENDPOINT>.<AWS_REGION>.amazonaws.com",
45
"namespace": "AWSSolutions/Druid",
56
"metrics_collected": {
67
"cpu": {
@@ -44,6 +45,7 @@
4445
"force_flush_interval": 30
4546
},
4647
"logs": {
48+
"endpoint_override": "https://logs<FIPS_ENDPOINT>.<AWS_REGION>.amazonaws.com",
4749
"logs_collected": {
4850
"files": {
4951
"collect_list": [

source/package-lock.json

+6-12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)