Skip to content

Commit

Permalink
Update app_signals to application_signals (#40)
Browse files Browse the repository at this point in the history
  • Loading branch information
bjrara authored May 17, 2024
1 parent 4be61c3 commit 4fedba1
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions charts/amazon-cloudwatch-observability/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ Helper function to modify cloudwatch-agent config
{{- $agent := set $configCopy "agent" $agentRegion }}
{{- end }}

{{- $appSignals := pluck "app_signals" $configCopy.logs.metrics_collected | first }}
{{- if and (hasKey $configCopy.logs.metrics_collected "app_signals") (empty $appSignals.hosted_in) }}
{{- $appSignals := pluck "application_signals" $configCopy.logs.metrics_collected | first }}
{{- if and (hasKey $configCopy.logs.metrics_collected "application_signals") (empty $appSignals.hosted_in) }}
{{- $clusterName := .Values.clusterName | required ".Values.clusterName is required." -}}
{{- $appSignals := set $appSignals "hosted_in" .Values.clusterName }}
{{- end }}
Expand All @@ -36,7 +36,7 @@ Helper function to modify cloudwatch-agent config
Helper function to modify customer supplied agent config if ContainerInsights or ApplicationSignals is enabled
*/}}
{{- define "cloudwatch-agent.modify-config" -}}
{{- if and (hasKey .Config "logs") (or (and (hasKey .Config.logs "metrics_collected") (hasKey .Config.logs.metrics_collected "app_signals")) (and (hasKey .Config.logs "metrics_collected") (hasKey .Config.logs.metrics_collected "kubernetes"))) }}
{{- if and (hasKey .Config "logs") (or (and (hasKey .Config.logs "metrics_collected") (hasKey .Config.logs.metrics_collected "application_signals")) (and (hasKey .Config.logs "metrics_collected") (hasKey .Config.logs.metrics_collected "kubernetes"))) }}
{{- include "cloudwatch-agent.config-modifier" . }}
{{- else }}
{{- default "" .Config | toJson | quote }}
Expand Down
4 changes: 2 additions & 2 deletions charts/amazon-cloudwatch-observability/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -185,12 +185,12 @@ agent:
"kubernetes": {
"enhanced_container_insights": true
},
"app_signals": { }
"application_signals": { }
}
},
"traces": {
"traces_collected": {
"app_signals": { }
"application_signals": { }
}
}
}
Expand Down

0 comments on commit 4fedba1

Please sign in to comment.