Merge branch 'develop' into NR-324109-Updating-IAST

src/content/docs/infrastructure/other-infrastructure-integrations/monitoring-jenkins-ot.mdx

@@ -111,4 +111,42 @@ After you've sent your Jenkins pipeline data to New Relic, you can also easily m
   The Jenkins OpenTelemetry plugin is not maintained by New Relic, so if you have any issues with the instrumentation, [create a new issue in the plugin's GitHub repo](https://github.com/jenkinsci/opentelemetry-plugin/issues).
 </Callout>
 
+## Resource attributes and tags [#attributes]
+
+You can add resource attributes to the Jenkins plugin configuration. This allows you to include attributes for all the plugin generated log, metric, and trace data. Resource attributes that have names starting with `tags.` will also add entity [tags to your Jenkins entity](/docs/opentelemetry/best-practices/opentelemetry-best-practices-resources/#tags).
+
+You can define attributes in two ways:
+
+<CollapserGroup>
+  <Collapser
+    id="attributes-config"
+    title="Define attributes in the Jenkins plugin configuration"
+  >
+    You can add the resource attributes to the `configurationProperties` element in the `io.jenkins.plugins.opentelemetry.JenkinsOpenTelemetryPluginConfiguration.xml` file. 
+
+    Example: 
+
+    ```xml
+      <configurationProperties>
+        otel.resource.attributes=attribute1=value1,attribute2=value2,tags.tag1=tagValue1
+      </configurationProperties>
+    ```
+  </Collapser>
+
+  <Collapser
+    id="attributes-env"
+    title="Define attributes in the environment variables"
+  >
+    You can define the resource attributes using the `OTEL_RESOURCE_ATTRIBUTES` environment variable. 
+
+    This could be done on an Ubuntu system via editing the systemctl configuration for jenkins using `systemctl edit jenkins` and adding to the override.conf portion of the configuration:
+
+    ```yml
+      [Service]
+      # Set OTel Environment Options
+      Environment="OTEL_RESOURCE_ATTRIBUTES=attribute1=value1,attribute2=value2,tags.tag1=tagValue1"
+    ```
+  </Collapser>
+</CollapserGroup>
+
 <InstallFeedback/>

src/content/docs/release-notes/infrastructure-release-notes/kubernetes-integration-release-notes/kubernetes-integration-3-32-3.mdx

@@ -0,0 +1,11 @@
+---
+subject: Kubernetes integration
+releaseDate: '2024-12-31'
+version: 3.32.3
+---
+
+For a detailed description of changes, see the [release notes](https://github.com/newrelic/nri-kubernetes/releases/tag/v3.32.3).
+
+This integration is included in the following chart versions:
+* [newrelic-infrastructure-3.37.3](https://github.com/newrelic/nri-kubernetes/releases/tag/newrelic-infrastructure-3.37.3)
+* [nri-bundle-5.0.105](https://github.com/newrelic/helm-charts/releases/tag/nri-bundle-5.0.105)

src/install/config/aws-cloudwatch.yaml

@@ -7,6 +7,7 @@ redirects:
     - /docs/infrastructure/amazon-integrations/get-started/aws-metric-stream-setup
     - /docs/infrastructure/amazon-integrations/connect/cloudwatch-metric-streams/aws-metric-stream
     - /docs/infrastructure/amazon-integrations/connect/cloudwatch-metric-streams/aws-metric-stream-setup
+    - /docs/infrastructure/amazon-integrations/connect/aws-metric-stream
 
 #----------------------------------------------------------------
 # Define the three methods for activating the integration: