Merge remote-tracking branch 'origin/master' into e2e-test-agent

coralogix · Mar 15, 2024 · ebeecf2 · ebeecf2
2 parents 073cd56 + edec436
commit ebeecf2
Show file tree

Hide file tree

Showing 15 changed files with 153 additions and 383 deletions.
diff --git a/logs/fluent-bit/ecs-fargate/README.md b/logs/fluent-bit/ecs-fargate/README.md
@@ -61,12 +61,16 @@ In order to allow container access to the S3 object, you'll need to provide the
 		{
 			"Effect": "Allow",
 			"Action": [
-				"s3:GetObject",
 				"s3:GetBucketLocation"
 			],
 			"Resource": "<Your specific bucket ARN>"
-            #or
-            "Resource": "*"
+		},
+		{
+			"Effect": "Allow",
+			"Action": [
+				"s3:GetObject"
+			],
+			"Resource": "<Your specific bucket ARN>/*"
 		}
 	]
 }

diff --git a/otel-agent/README.md b/otel-agent/README.md
@@ -23,7 +23,7 @@ The section contains integrations of the Open Telemetry agent for various platfo
 
 **Agent Implementations:**
 
-1. [otel-ecs-ec2](../otel-ecs-ec2/)
+1. [otel-ecs-ec2](https://github.com/coralogix/cloudformation-coralogix-aws/tree/master/opentelemetry/ecs-ec2)
 2. [k8s helm](./k8s-helm/)
 
 ## Coralogix's Endpoints

diff --git a/otel-agent/k8s-helm/README.md b/otel-agent/k8s-helm/README.md
@@ -15,7 +15,7 @@ The included agent provides:
 - [Kubelet Metrics](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/kubeletstatsreceiver) - Fetches running container metrics from the local Kubelet.
 - [OTLP Metrics](https://github.com/open-telemetry/opentelemetry-collector/blob/main/receiver/otlpreceiver/README.md) - Send application metrics via OpenTelemetry protocol.
 - Traces - You can send data in various format, such as [Jaeger](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/jaegerreceiver), [OpenTelemetry Protocol](https://github.com/open-telemetry/opentelemetry-collector/blob/main/receiver/otlpreceiver/README.md) or [Zipkin](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/zipkinreceiver).
-- [Span Metrics](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/connector/spanmetricsconnector) - Traces are converted to Requests, Duration and Error metrics using spanmetrics processor.
+- [Span Metrics](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/connector/spanmetricsconnector/README.md) - Traces are converted to Requests, Duration and Error metrics using spanmetrics processor.
 - [Zpages Extension](https://github.com/open-telemetry/opentelemetry-collector/tree/main/extension/zpagesextension) - You can investigate latency and error issues by navigating to Pod's localhost:55516 web server. Routes are desribed in [OpenTelemetry documentation](https://github.com/open-telemetry/opentelemetry-collector/tree/main/extension/zpagesextension#exposed-zpages-routes)
 
 ## Prerequisites

diff --git a/otel-collector-windows-image/Dockerfile b/otel-collector-windows-image/Dockerfile
@@ -3,7 +3,7 @@ ARG WIN_BASE_IMAGE
 
 FROM --platform=$BUILDPLATFORM curlimages/curl AS build
 WORKDIR /src
-RUN curl -Lo otelcol.tar.gz https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v0.93.0/otelcol-contrib_0.93.0_windows_amd64.tar.gz
+RUN curl -Lo otelcol.tar.gz https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v0.96.0/otelcol-contrib_0.96.0_windows_amd64.tar.gz
 RUN tar -xzvf otelcol.tar.gz
 
 ##

diff --git a/otel-ecs-ec2/CHANGELOG.md b/otel-ecs-ec2/CHANGELOG.md
diff --git a/otel-ecs-ec2/README.md b/otel-ecs-ec2/README.md
diff --git a/otel-ecs-ec2/config.yaml b/otel-ecs-ec2/config.yaml
diff --git a/otel-ecs-ec2/logging.yaml b/otel-ecs-ec2/logging.yaml