diff --git a/amp-ecs.cfhighlander.rb b/amp-ecs.cfhighlander.rb index 430aab3..26eb889 100644 --- a/amp-ecs.cfhighlander.rb +++ b/amp-ecs.cfhighlander.rb @@ -13,7 +13,7 @@ ComponentParam 'GrafanaAccountId', '' end - Component template: 'fargate-v2@0.7.1', name: 'exporter', render: Inline do + Component template: 'fargate-v2@0.8.6', name: 'exporter', render: Inline do parameter name: 'VPCId', value: Ref(:VPCId) parameter name: 'SubnetIds', value: FnSplit(',', Ref(:SubnetIds)) parameter name: 'EcsCluster', value: Ref(:EcsCluster) diff --git a/amp-ecs.cfndsl.rb b/amp-ecs.cfndsl.rb index e8ee292..c87e466 100644 --- a/amp-ecs.cfndsl.rb +++ b/amp-ecs.cfndsl.rb @@ -19,7 +19,7 @@ ecs_aot_config['extensions']['ecs_observer'].merge!(aot_ecs_observer) SSM_Parameter(:AotConfig) do - Name FnSub('/${EnvironmentName}/amq-ecs/AOT_CONFIG_CONTENT') + Name FnSub('/${EnvironmentName}/amp-ecs/AOT_CONFIG_CONTENT') Type 'String' Value FnSub("#{YAML.dump(ecs_aot_config)}") Description 'AWS OpenTelemetry ECS Exporter Config' diff --git a/amp-ecs.config.yaml b/amp-ecs.config.yaml index e6634cc..e57b2bd 100644 --- a/amp-ecs.config.yaml +++ b/amp-ecs.config.yaml @@ -18,9 +18,11 @@ aot_ecs_observer: - port_label: ECS_PROMETHEUS_EXPORTER_PORT_V2 metrics_path_label: ECS_PROMETHEUS_EXPORTER_METRICS_PATH - default_aot_config_content: extensions: + sigv4auth: + service: "aps" + region: "${AWS::Region}" ecs_observer: refresh_interval: 60s # format is https://golang.org/pkg/time/#ParseDuration cluster_name: '${EnvironmentName}-services' # cluster name need manual config @@ -56,22 +58,20 @@ default_aot_config_content: batch: {} exporters: - awsprometheusremotewrite: + prometheusremotewrite: endpoint: ${APSWorkspace.PrometheusEndpoint}api/v1/remote_write - aws_auth: - region: ${AWS::Region} - service: "aps" + auth: + authenticator: sigv4auth logging: - loglevel: debug + loglevel: info - service: - extensions: [ ecs_observer ] + extensions: [ ecs_observer, sigv4auth ] pipelines: metrics: - receivers: [prometheus] + receivers: [ prometheus ] processors: [ batch ] - exporters: [awsprometheusremotewrite] + exporters: [ prometheusremotewrite ] components: exporter: @@ -85,7 +85,7 @@ components: otelexport: repo: ghcr.io image: base2services/aws-ecs-otel-collector - tag: v0.15.1 + tag: v0.41.0 env_vars: ENVIRONMENT_NAME: Fn::Sub: ${EnvironmentName} @@ -93,7 +93,7 @@ components: Fn::Sub: ${AWS::Region} secrets: ssm: - AOT_CONFIG_CONTENT: /${EnvironmentName}/amq-ecs/AOT_CONFIG_CONTENT + AOT_CONFIG_CONTENT: /${EnvironmentName}/amp-ecs/AOT_CONFIG_CONTENT iam_policies: ecsscan: action: