Merge branch 'aws-otel:main' into main

Author: mhausenblas

package-lock.json

@@ -19,28 +19,28 @@
     "@mdx-js/mdx": "^1.6.18",
     "@mdx-js/react": "^1.6.18",
     "@reach/router": "^1.3.4",
-    "@rocketseat/gatsby-theme-docs": "^2.2.3",
+    "@rocketseat/gatsby-theme-docs": "^2.4.0",
     "assets": "^3.0.1",
     "aws-rum-web": "1.8.3",
     "camelcase-keys": "^6.1.0",
-    "classnames": "^2.2.6",
+    "classnames": "^2.3.2",
     "core-js": "^3.23.3",
     "gatsby": "^3.0.0",
-    "gatsby-plugin-canonical-urls": "^3.0.0",
+    "gatsby-plugin-canonical-urls": "^3.15.0",
     "gatsby-plugin-manifest": "^3.0.0",
     "gatsby-plugin-material-ui": "1.2.5",
     "gatsby-plugin-mdx": "^2.14.1",
     "gatsby-plugin-offline": "^4.0.0",
     "gatsby-plugin-react-helmet": "^4.0.8",
-    "gatsby-plugin-remove-trailing-slashes": "^3.0.0",
+    "gatsby-plugin-remove-trailing-slashes": "^3.15.0",
     "gatsby-plugin-resolve-src": "^2.0.0",
     "gatsby-plugin-sass": "4.15.0",
     "gatsby-plugin-sitemap": "^4.11.0",
     "gatsby-source-filesystem": "^3.0.0",
     "gatsby-transformer-remark": "^4.12.0",
     "gatsby-transformer-yaml": "^3.0.0",
     "github-base": "^1.0.0",
-    "history": "^4.7.2",
+    "history": "^5.3.0",
     "install": "^0.13.0",
     "node-fetch": "^3.2.6",
     "nouislider": "^13.1.1",
@@ -56,13 +56,16 @@
     "react-id-generator": "^3.0.1",
     "react-router-dom": "^6.3.0",
     "react-slick": "^0.29.0",
-    "react-swipeable-views": "^0.13.1",
+    "react-swipeable-views": "^0.14.0",
     "sass": "^1.5.4",
     "typeface-roboto": "1.1.13",
     "typeface-roboto-slab": "1.1.13"
   },
   "overrides": {
-    "multer": "1.4.4-lts.1"
+    "multer": "1.4.4-lts.1",
+    "gatsby-remark-embedder":  "5.0.0",
+    "got": "^11.8.5",
+    "sharp": "^0.30.5"
   },
   "devDependencies": {
     "prettier": "^1.16.4"

package.json

@@ -62,8 +62,7 @@ export const sideBarData = [
         {label: "Ruby", link: "/docs/getting-started/ruby-sdk"},
         {label: ".NET", link: "/docs/getting-started/dotnet-sdk"},
         {label: "PHP", link: "/docs/getting-started/php-sdk"},
-        {label: "k8s Operator", link: "/docs/getting-started/operator"},
-        {label: "ADOT with EKS add-ons", link: "/docs/getting-started/adot-eks-add-on"},
+        {label: "EKS add-on", link: "/docs/getting-started/adot-eks-add-on"},
         {label: "Lambda", link: "/docs/getting-started/lambda"},
         {label: "Amazon Managed Service for Prometheus (AMP)", link: "/docs/getting-started/prometheus-remote-write-exporter"},
         {label: "Prometheus Configurations", link: "/docs/getting-started/advanced-prometheus-remote-write-configurations"},

src/config/sideBarData.js

@@ -6,6 +6,14 @@ description:
 path: /blog
 
 blogs:
+  - title: "AWS Distro for OpenTelemetry v0.26.0 is now available"
+    author: "Bryan Aguilar"
+    date: "02-Feb-2023"
+    body:
+      "AWS Distro for OpenTelemetry v0.25.0 is now available. You can download the latest AWS Distro for OpenTelemetry Collector image
+      from the Amazon Elastic Container Registry (Amazon ECR) Public Gallery."
+    link: "/docs/ReleaseBlogs/aws-distro-for-opentelemetry-collector-v0.26.0"
+
   - title: "AWS Distro for OpenTelemetry Lambda Layers are now available with ADOT Collector v0.25.0"
     author: "Bryan Aguilar"
     date: "11-Jan-2023"

src/content/BlogPosts/blogPosts.yaml

@@ -0,0 +1,47 @@
+---
+title: 'AWS Distro for OpenTelemetry v0.26.0'
+description:
+    This blog post is the release announcement for ADOT v0.26.0
+---
+
+import SectionSeparator from "components/MdxSectionSeparator/sectionSeparator.jsx"
+
+<SectionSeparator />
+
+[AWS Distro for OpenTelemetry (ADOT)](https://aws-otel.github.io/) v0.26.0 is now available.
+You can download the latest [ADOT Collector image](https://gallery.ecr.aws/aws-observability/aws-otel-collector) from the 
+[Amazon Elastic Container Registry (Amazon ECR)](https://aws.amazon.com/ecr/) Public Gallery.
+
+<SectionSeparator />
+
+**Release Highlights**
+
+* Changes have been made to the ADOT Collector Windows Installer. If you are using Windows, we reccomend performing a full uninstall of the
+ADOT Collector before installing v0.26.0. For details on the change please see [PR#1808](https://github.com/aws-observability/aws-otel-collector/pull/1809).
+* OpenTelemetry Collector [v0.69.0](https://github.com/open-telemetry/opentelemetry-collector/releases/tag/v0.69.0)
+* OpenTelemetry Collector [v0.70.0](https://github.com/open-telemetry/opentelemetry-collector/releases/tag/v0.70.0)
+
+
+Detailed release notes are on [GitHub](https://github.com/aws-observability/aws-otel-collector/releases). 
+All code changes are upstream in the respective OpenTelemetry project components.
+
+**Download**
+
+Detailed technical documentation is available on the [ADOT developer site](https://aws-otel.github.io/), 
+and you can [download the distribution](https://aws-otel.github.io/download) from 
+[GitHub](https://github.com/aws-observability/aws-otel-collector/releases/tag/v0.26.0).
+You can also download the latest [ADOT Collector image](https://gallery.ecr.aws/aws-observability/aws-otel-collector) 
+from the [Amazon Elastic Container Registry (Amazon ECR)](https://aws.amazon.com/ecr/) Public Gallery.
+
+To learn more about how to use AWS Distro for OpenTelemetry (ADOT) to collect data for your observability solution, 
+check out the hands-on [AWS Observability workshop](https://observability.workshop.aws/en/adot.html). 
+Please file an [issue](https://github.com/aws-observability/aws-otel-community/issues) if you have any 
+questions about the distribution, features, or its components.
+
+We also welcome you to participate in the [OpenTelemetry project](https://github.com/open-telemetry). 
+The project was [approved for incubation](https://www.cncf.io/blog/2021/08/26/opentelemetry-becomes-a-cncf-incubating-project/) status 
+in August 2021 by the Cloud Native Computing Foundation Technical Oversight Committee (CNCF TOC). Learn more about
+[AWS Distro for OpenTelemetry](https://aws.amazon.com/blogs/opensource/category/management-tools/aws-distro-for-opentelemetry/) on the 
+[AWS Open Source Blog](https://aws.amazon.com/blogs/opensource/category/management-tools/aws-distro-for-opentelemetry/), where we announced 
+the distribution’s [general availability for tracing](https://aws.amazon.com/blogs/opensource/aws-distro-for-opentelemetry-is-now-ga-for-tracing/) in September 2021 
+and the distribution's [general availability for metrics](https://aws.amazon.com/blogs/opensource/aws-distro-for-opentelemetry-is-now-generally-available-for-metrics/) in May 2022.

src/content/Blogs/ReleaseBlogs/aws-distro-for-opentelemetry-collector-v0.26.0.mdx

@@ -1,3 +1,10 @@
+- version: 'AWS Distro for OpenTelemetry Collector Version 0.26.0'
+  releaseDate: 'February-02-2023'
+  license: 'Apache-2.0'
+  releaseNotesLink: 'https://github.com/aws-observability/aws-otel-collector/releases/tag/v0.26.0'
+  documentationLink: 'https://github.com/aws-observability/aws-otel-collector/blob/v0.26.0/README.md'
+  downloadLink: 'https://gallery.ecr.aws/aws-observability/aws-otel-collector'
+
 - version: 'AWS Distro for OpenTelemetry Collector Version 0.25.0'
   releaseDate: 'January-10-2023'
   license: 'Apache-2.0'
@@ -93,7 +100,7 @@
   releaseDate: 'Mar-04-2022'
   license: 'Apache-2.0'
   releaseNotesLink: 'https://github.com/open-telemetry/opentelemetry-operator/releases/tag/v0.45.0'
-  documentationLink: 'https://aws-otel.github.io/docs/getting-started/operator'
+  documentationLink: 'https://aws-otel.github.io/docs/getting-started/adot-eks-add-on'
   downloadLink: 'https://gallery.ecr.aws/aws-observability/adot-operator'
 
 - version: 'AWS Distro for OpenTelemetry Collector Version 0.17.1'
@@ -149,7 +156,7 @@
   releaseDate: 'Nov-23-2021'
   license: 'Apache-2.0'
   releaseNotesLink: 'https://github.com/open-telemetry/opentelemetry-operator/releases/tag/v0.38.0'
-  documentationLink: 'https://aws-otel.github.io/docs/getting-started/operator'
+  documentationLink: 'https://aws-otel.github.io/docs/getting-started/adot-eks-add-on'
   downloadLink: 'https://gallery.ecr.aws/aws-observability/adot-operator'
 
 - version: 'AWS Distro for OpenTelemetry Collector Version 0.14.1'
@@ -170,7 +177,7 @@
   releaseDate: 'Oct-29-2021'
   license: 'Apache-2.0'
   releaseNotesLink: 'https://github.com/open-telemetry/opentelemetry-operator/releases/tag/v0.37.1'
-  documentationLink: 'https://aws-otel.github.io/docs/getting-started/operator'
+  documentationLink: 'https://aws-otel.github.io/docs/getting-started/adot-eks-add-on'
   downloadLink: 'https://gallery.ecr.aws/aws-observability/adot-operator'
 
 - version: 'AWS Distro for OpenTelemetry Collector Version 0.13.0'
@@ -191,7 +198,7 @@
   releaseDate: 'Sep-22-2021'
   license: 'Apache-2.0'
   releaseNotesLink: 'https://github.com/open-telemetry/opentelemetry-operator/releases/tag/v0.34.0'
-  documentationLink: 'https://aws-otel.github.io/docs/getting-started/operator'
+  documentationLink: 'https://aws-otel.github.io/docs/getting-started/adot-eks-add-on'
   downloadLink: 'https://gallery.ecr.aws/aws-observability/adot-operator'
 
 - version: 'Nuget:OpenTelemetry.Contrib.Extensions.AWSXRay v1.1.0'

src/content/Downloads/downloads.yaml

@@ -1,5 +1,5 @@
 ---
-title: 'Getting started using AWS ECS container metrics receiver in AWS OpenTelemetry Collector'
+title: 'Getting started using AWS ECS container metrics receiver in AWS Distro for OpenTelemetry Collector'
 description:
     The Amazon ECS container agent provides a method to retrieve various task metadata and Docker stats, which is
     referred to as the task metadata endpoint. AWS Container Observability team wrote a receiver in the OpenTelemetry

src/docs/components/ecs-metrics-receiver.mdx

@@ -47,7 +47,42 @@ Follow these steps to use the EKS console to leverage EKS add-ons for deploying
 
 ## Deploy the ADOT Collector
 
-Once the ADOT EKS Add-On is running, you can deploy the ADOT Collector into your EKS cluster. The ADOT Collector can be deployed in one of four modes: Deployment, Daemonset, StatefulSet, and Sidecar. See [this page](https://aws-otel.github.io/docs/getting-started/operator#step-2-install-adot-collector-as-kubernetes-custom-resource-to-your-eks-cluster) for more information on these deployment modes.
+Once the ADOT EKS Add-On is running, you can deploy the ADOT Collector into your EKS cluster. The ADOT Collector can be deployed in one of four modes: Deployment, Daemonset, StatefulSet, and Sidecar. Each mode is briefly described below.
+
+### Deployment Mode
+
+If you want to get more control of the Collector and create a standalone application, Deployment would be your choice. With Deployment,
+you can relatively easily scale up the Collector to monitor more targets, roll back to an early version if anything unexpected happens,
+pause the Collector, etc. In general, you can manage your Collector instance just as an application.
+
+### DaemonSet Mode
+
+DaemonSet should satisfy your needs if you want the Collector run as an agent in your Kubernetes nodes. In this case, every Kubernetes
+node will have its own Collector copy which would monitor the pods in it.
+
+### StatefulSet Mode
+
+There are three main advantages to deploying the Collector as a StatefulSet:
+
+- Predictable names of the Collector instance will be expected  
+  If you use above two approaches to deploy the Collector, the pod name of your Collector instance will be unique (its name plus random sequence).
+  However, each Pod in a StatefulSet derives its hostname from the name of the StatefulSet and the ordinal of the Pod (my-col-0, my-col-1, my-col-2, etc.).
+- Rescheduling will be arranged when a Collector replica fails  
+  If a Collector pod fails in the StatefulSet, Kubernetes will attempt to reschedule a new pod with the same name to the same node.
+  Kubernetes will also attempt to attach the same sticky identity (e.g., volumes) to the new pod.
+- The target allocator could be configured  
+  The target allocator will use a HTTP server to expose the scrape targets to a specific endpoint URL, which will be used by the
+  Prometheus receiver to scrape metrics data. Additionally, the target allocator will use that discovery information to evenly delegate scraping
+  jobs to the collector instances inside a StatefulSet based on a replica's current workload.
+
+### Sidecar Mode
+
+The biggest advantage of the sidecar mode is that it allows people to offload their telemetry data as fast and reliable as possible
+from their applications. This Collector instance will work on the container level and no new pod will be created, which is perfect to
+keep your EKS cluster clean and easily to be managed. Moreover, you can also use the sidecar mode when you want to use a different collect/export
+strategy, which just suits this application.
+
+Once a Sidecar instance exists in a given namespace, make sure that your deployment is in that same namespace as well. That deployment can get a sidecar by either adding the annotation `sidecar.opentelemetry.io/inject: "true"` to the pod spec of your application, or to the namespace.
 
 ### Use your IAM role to launch the ADOT Collector
 You can associate your IAM role to your EKS service account using [IRSA](https://docs.aws.amazon.com/emr/latest/EMR-on-EKS-DevelopmentGuide/setting-up-enable-IAM.html). Your service account can then provide AWS permissions to the containers you run in any pod that use that service account. You must use this command for each cluster where you're installing ADOT to grant your AWS service account permissions.

src/docs/getting-started/adot-eks-add-on/installation.mdx

@@ -12,9 +12,9 @@ path: '/docs/getting-started/adot-eks-add-on/requirements'
 
 * [eksctl](https://docs.aws.amazon.com/eks/latest/userguide/eksctl.html) is installed
 
-* Your cluster should be on Kubernetes version 1.19 or higher. You can verify the version you’re running with the following command:
+* Your cluster should be on Kubernetes version 1.21 or higher. You can verify the version you’re running with the following command:
 ```console
-kubectl version | grep "Server Version"`
+kubectl version | grep "Server Version"
 ```
 
 * Make sure that you can use kubectl with your EKS cluster by updating your `kubeconfig` if necessary:

src/docs/getting-started/adot-eks-add-on/requirements.mdx

@@ -36,7 +36,7 @@ The following platforms are supported:
 
 - <Link to="/docs/getting-started/container-insights/eks-infra">Amazon EKS and Kubernetes platforms on Amazon EC2</Link>
 - <Link to="/docs/getting-started/container-insights/eks-fargate">Amazon EKS and Kubernetes platforms on Amazon Fargate</Link>
-- [Amazon ECS with cluster- and service-level metrics](https://aws-otel.github.io/docs/components/ecs-metrics-receiver)
+- [Amazon ECS with cluster and service-level metrics](https://aws-otel.github.io/docs/components/ecs-metrics-receiver)
 - Amazon ECS on Amazon EC2 with instance-level metrics (upcoming)
 
 ## Collecting Prometheus metrics