From 23feb989d11e3861a6fe1b0369b6283470de949f Mon Sep 17 00:00:00 2001 From: Brian Peck Date: Fri, 27 Dec 2024 11:33:21 -0500 Subject: [PATCH 1/7] feat(ResourceAttributes): Add resource attributes config --- .../monitoring-jenkins-ot.mdx | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/src/content/docs/infrastructure/other-infrastructure-integrations/monitoring-jenkins-ot.mdx b/src/content/docs/infrastructure/other-infrastructure-integrations/monitoring-jenkins-ot.mdx index 88a827dac1c..6f322447181 100644 --- a/src/content/docs/infrastructure/other-infrastructure-integrations/monitoring-jenkins-ot.mdx +++ b/src/content/docs/infrastructure/other-infrastructure-integrations/monitoring-jenkins-ot.mdx @@ -111,4 +111,39 @@ 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). +## Resource Attributes and Tags [#attributes] + +Resource attributes can be added to the Jenkins plugin configuration and will be included as attributes on all log, metric, and trace data generated by the plugin. Resource attributes with names that start with `tags.` will [also add entity tags to your Jenkins entity](/docs/opentelemetry/best-practices/opentelemetry-best-practices-resources/#tags). + + + + Resource attributes can be added to the `configurationProperties` element in the `io.jenkins.plugins.opentelemetry.JenkinsOpenTelemetryPluginConfiguration.xml` file. + + Example: + ``` + + otel.resource.attributes=attribute1=value1,attribute2=value2,tags.tag1=tagValue1 + + ``` + + + + Resource attributes can also be defined 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: + + ``` + [Service] + # Set OTel Environment Options + Environment="OTEL_RESOURCE_ATTRIBUTES=attribute1=value1,attribute2=value2,tags.tag1=tagValue1" + ``` + + + From ecf0f55f488c9b967a3d20499f5c1469f88923e2 Mon Sep 17 00:00:00 2001 From: WriteMayur Date: Mon, 30 Dec 2024 13:58:08 +0530 Subject: [PATCH 2/7] lingustic-update --- .../monitoring-jenkins-ot.mdx | 31 ++++++++++--------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/src/content/docs/infrastructure/other-infrastructure-integrations/monitoring-jenkins-ot.mdx b/src/content/docs/infrastructure/other-infrastructure-integrations/monitoring-jenkins-ot.mdx index 6f322447181..bf076a20a27 100644 --- a/src/content/docs/infrastructure/other-infrastructure-integrations/monitoring-jenkins-ot.mdx +++ b/src/content/docs/infrastructure/other-infrastructure-integrations/monitoring-jenkins-ot.mdx @@ -111,37 +111,40 @@ 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). -## Resource Attributes and Tags [#attributes] +## Resource attributes and tags [#attributes] -Resource attributes can be added to the Jenkins plugin configuration and will be included as attributes on all log, metric, and trace data generated by the plugin. Resource attributes with names that start with `tags.` will [also add entity tags to your Jenkins entity](/docs/opentelemetry/best-practices/opentelemetry-best-practices-resources/#tags). +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 has names starts 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: - Resource attributes can be added to the `configurationProperties` element in the `io.jenkins.plugins.opentelemetry.JenkinsOpenTelemetryPluginConfiguration.xml` file. + You can add the resource attributes to the `configurationProperties` element in the `io.jenkins.plugins.opentelemetry.JenkinsOpenTelemetryPluginConfiguration.xml` file. Example: - ``` - - otel.resource.attributes=attribute1=value1,attribute2=value2,tags.tag1=tagValue1 - + + ```xml + + otel.resource.attributes=attribute1=value1,attribute2=value2,tags.tag1=tagValue1 + ``` - Resource attributes can also be defined using the `OTEL_RESOURCE_ATTRIBUTES` environment variable. + 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: - ``` - [Service] - # Set OTel Environment Options - Environment="OTEL_RESOURCE_ATTRIBUTES=attribute1=value1,attribute2=value2,tags.tag1=tagValue1" + ```yml + [Service] + # Set OTel Environment Options + Environment="OTEL_RESOURCE_ATTRIBUTES=attribute1=value1,attribute2=value2,tags.tag1=tagValue1" ``` From aecab23c8b71240a1b014d1ccc641aef825bf37e Mon Sep 17 00:00:00 2001 From: WriteMayur Date: Mon, 30 Dec 2024 15:16:31 +0530 Subject: [PATCH 3/7] fix broken link --- src/install/aws-cloudwatch/intro.mdx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/install/aws-cloudwatch/intro.mdx b/src/install/aws-cloudwatch/intro.mdx index 74893b24494..b91db5219f3 100644 --- a/src/install/aws-cloudwatch/intro.mdx +++ b/src/install/aws-cloudwatch/intro.mdx @@ -1,6 +1,9 @@ --- headingText: Before we start componentType: default +redirects: + - /docs/infrastructure/amazon-integrations/connect/aws-metric-stream/ + --- Amazon CloudWatch Metric Streams is an AWS service that creates a real-time stream of metrics to a destination of your choice. To stream your AWS data to New Relic, you can create a custom Firehose that forwards AWS metrics to our CloudWatch Metric Streams integration. This lets you view your AWS data in the New Relic platform. From 251bb2e09229efbfbfb253393cbb52b6e99188f0 Mon Sep 17 00:00:00 2001 From: WriteMayur Date: Mon, 30 Dec 2024 15:37:03 +0530 Subject: [PATCH 4/7] fix broken link --- src/install/aws-cloudwatch/intro.mdx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/install/aws-cloudwatch/intro.mdx b/src/install/aws-cloudwatch/intro.mdx index b91db5219f3..2ae000a40d7 100644 --- a/src/install/aws-cloudwatch/intro.mdx +++ b/src/install/aws-cloudwatch/intro.mdx @@ -2,8 +2,7 @@ headingText: Before we start componentType: default redirects: - - /docs/infrastructure/amazon-integrations/connect/aws-metric-stream/ - + - /docs/infrastructure/amazon-integrations/connect/aws-metric-stream --- Amazon CloudWatch Metric Streams is an AWS service that creates a real-time stream of metrics to a destination of your choice. To stream your AWS data to New Relic, you can create a custom Firehose that forwards AWS metrics to our CloudWatch Metric Streams integration. This lets you view your AWS data in the New Relic platform. From 1ce11ea68ef7f5d3ca6e843a052c824c40bfd180 Mon Sep 17 00:00:00 2001 From: WriteMayur Date: Mon, 30 Dec 2024 16:02:03 +0530 Subject: [PATCH 5/7] fix broken link --- src/install/aws-cloudwatch/intro.mdx | 2 -- src/install/config/aws-cloudwatch.yaml | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/install/aws-cloudwatch/intro.mdx b/src/install/aws-cloudwatch/intro.mdx index 2ae000a40d7..74893b24494 100644 --- a/src/install/aws-cloudwatch/intro.mdx +++ b/src/install/aws-cloudwatch/intro.mdx @@ -1,8 +1,6 @@ --- headingText: Before we start componentType: default -redirects: - - /docs/infrastructure/amazon-integrations/connect/aws-metric-stream --- Amazon CloudWatch Metric Streams is an AWS service that creates a real-time stream of metrics to a destination of your choice. To stream your AWS data to New Relic, you can create a custom Firehose that forwards AWS metrics to our CloudWatch Metric Streams integration. This lets you view your AWS data in the New Relic platform. diff --git a/src/install/config/aws-cloudwatch.yaml b/src/install/config/aws-cloudwatch.yaml index 7ad2c33e714..d47795ebc35 100644 --- a/src/install/config/aws-cloudwatch.yaml +++ b/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: From 6f53bd2bcced93bd5274c00ecd4584095694a77c Mon Sep 17 00:00:00 2001 From: Brian Peck Date: Mon, 30 Dec 2024 09:15:48 -0500 Subject: [PATCH 6/7] fix(grammar): Improved grammar from my previous PR --- .../other-infrastructure-integrations/monitoring-jenkins-ot.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/content/docs/infrastructure/other-infrastructure-integrations/monitoring-jenkins-ot.mdx b/src/content/docs/infrastructure/other-infrastructure-integrations/monitoring-jenkins-ot.mdx index bf076a20a27..9d1cd043ebd 100644 --- a/src/content/docs/infrastructure/other-infrastructure-integrations/monitoring-jenkins-ot.mdx +++ b/src/content/docs/infrastructure/other-infrastructure-integrations/monitoring-jenkins-ot.mdx @@ -113,7 +113,7 @@ After you've sent your Jenkins pipeline data to New Relic, you can also easily m ## 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 has names starts with `tags.` will also add entity [tags to your Jenkins entity](/docs/opentelemetry/best-practices/opentelemetry-best-practices-resources/#tags). +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: From 40c582786337bd4662a12ff784e452b78f09ec99 Mon Sep 17 00:00:00 2001 From: NewRelic-K8s-Agents-Bot Date: Tue, 31 Dec 2024 12:02:34 +0000 Subject: [PATCH 7/7] feat: Add release notes for Kubernetes integration v3.32.3 --- .../kubernetes-integration-3-32-3.mdx | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 src/content/docs/release-notes/infrastructure-release-notes/kubernetes-integration-release-notes/kubernetes-integration-3-32-3.mdx diff --git a/src/content/docs/release-notes/infrastructure-release-notes/kubernetes-integration-release-notes/kubernetes-integration-3-32-3.mdx b/src/content/docs/release-notes/infrastructure-release-notes/kubernetes-integration-release-notes/kubernetes-integration-3-32-3.mdx new file mode 100644 index 00000000000..a2200394ecc --- /dev/null +++ b/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)