Align host monitoring config with newrelic-opentelemetry-examples (#115)

newrelic · Jul 23, 2024 · e09d065 · e09d065
1 parent db12d6a
commit e09d065
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 22 deletions.
diff --git a/configs/README.md b/configs/README.md
@@ -11,7 +11,7 @@
 If the collector was installed using a Linux package manager (APT, RPM, etc) some environment variables are predefined in the Systemd service [environment file](../distributions/nr-otel-collector/nr-otel-collector.conf):
 
 ```
-OTEL_EXPORTER_OTLP_ENDPOINT=otlp.nr-data.net:443
+OTEL_EXPORTER_OTLP_ENDPOINT=https://otlp.nr-data.net:443
 NEW_RELIC_MEMORY_LIMIT_MIB=100
 ```
 
@@ -20,5 +20,5 @@ The `NEW_RELIC_LICENSE_KEY` environment variable must be set manually, it can be
 #### Command line
 
 ```
-OTEL_EXPORTER_OTLP_ENDPOINT=otlp.nr-data.net:4317 NEW_RELIC_MEMORY_LIMIT_MIB=100 NEW_RELIC_LICENSE_KEY=your_license_key nr-otel-collector --config nr-otel-collector-agent-linux.yaml
+OTEL_EXPORTER_OTLP_ENDPOINT=https://otlp.nr-data.net:4317 NEW_RELIC_MEMORY_LIMIT_MIB=100 NEW_RELIC_LICENSE_KEY=your_license_key nr-otel-collector --config nr-otel-collector-agent-linux.yaml
 ```
diff --git a/configs/nr-otel-collector-agent-linux.yaml b/configs/nr-otel-collector-agent-linux.yaml
@@ -4,8 +4,9 @@
 # If the collector is not installed through a package manager, the following
 # environment variables need to be set:
 # - NEW_RELIC_MEMORY_LIMIT_MIB: Maximum amount of memory to be used. (default: 100)
-# - OTEL_EXPORTER_OTLP_ENDPOINT: New Relic Otlp endpoint to export metrics to (see: https://docs.newrelic.com/docs/more-integrations/open-source-telemetry-integrations/opentelemetry/get-started/opentelemetry-set-up-your-app/#review-settings)
+# - OTEL_EXPORTER_OTLP_ENDPOINT: New Relic OTLP endpoint to export metrics to (see: https://docs.newrelic.com/docs/opentelemetry/best-practices/opentelemetry-otlp/)
 
+# Keep host monitoring configuration in sync with: https://github.com/newrelic/newrelic-opentelemetry-examples/blob/main/other-examples/collector/host-monitoring/k8s/collector.yaml
 extensions:
   health_check:
 
@@ -16,7 +17,8 @@ receivers:
       http:
 
   hostmetrics:
-    collection_interval: 20s
+    # Default collection interval is 60s. Lower if you need finer granularity.
+    collection_interval: 60s
     scrapers:
       cpu:
         metrics:
@@ -51,13 +53,14 @@ receivers:
         metrics:
           system.network.connections:
             enabled: false
-      processes:
-      process:
-        metrics:
-          process.cpu.utilization:
-            enabled: true
-          process.cpu.time:
-            enabled: false
+      # Uncomment to enable process metrics, which can be noisy but valuable.
+      # processes:
+      # process:
+      #  metrics:
+      #    process.cpu.utilization:
+      #      enabled: true
+      #    process.cpu.time:
+      #      enabled: false
 
   filelog:
     include:
@@ -147,6 +150,15 @@ processors:
       - key: type
         action: delete
 
+  cumulativetodelta:
+
+  transform/host:
+    metric_statements:
+      - context: metric
+        statements:
+          - set(description, "")
+          - set(unit, "")
+
   transform:
     trace_statements:
       - context: span
@@ -184,16 +196,15 @@ processors:
 
 exporters:
   logging:
-  otlp:
+  otlphttp:
     endpoint: ${OTEL_EXPORTER_OTLP_ENDPOINT}
     headers:
       api-key: ${NEW_RELIC_LICENSE_KEY}
 
-
 service:
   pipelines:
-    metrics:
-      receivers: [otlp, hostmetrics]
+    metrics/host:
+      receivers: [hostmetrics]
       processors:
         - memory_limiter
         - metricstransform
@@ -206,17 +217,27 @@ service:
         - filter/exclude_system_disk
         - filter/exclude_network
         - attributes/exclude_system_paging
-        - batch
+        - transform/host
         - resourcedetection
         - resourcedetection/cloud
-      exporters: [logging,otlp]
+        - cumulativetodelta
+        - batch
+      exporters: [logging, otlphttp]
+    logs/host:
+      receivers: [filelog]
+      processors: [transform, resourcedetection, resourcedetection/cloud, batch]
+      exporters: [logging, otlphttp]
     traces:
       receivers: [otlp]
       processors: [transform, resourcedetection, resourcedetection/cloud, batch]
-      exporters: [logging, otlp]
+      exporters: [logging, otlphttp]
+    metrics:
+      receivers: [otlp]
+      processors: [transform, resourcedetection, resourcedetection/cloud, batch]
+      exporters: [logging, otlphttp]
     logs:
-      receivers: [otlp, filelog]
+      receivers: [otlp]
       processors: [transform, resourcedetection, resourcedetection/cloud, batch]
-      exporters: [logging, otlp]
+      exporters: [logging, otlphttp]
 
   extensions: [health_check]
diff --git a/distributions/nr-otel-collector/nr-otel-collector.conf b/distributions/nr-otel-collector/nr-otel-collector.conf
@@ -1,7 +1,7 @@
 # Systemd environment file for the nr-otel-collector service
 
 # New Relic default variables
-OTEL_EXPORTER_OTLP_ENDPOINT=otlp.nr-data.net:4317
+OTEL_EXPORTER_OTLP_ENDPOINT=https://otlp.nr-data.net:4317
 NEW_RELIC_MEMORY_LIMIT_MIB=100
 
 # Command-line options for the nr-otel-collector service.

diff --git a/test/canaries/templates/nr-otel-collector-agent.yml.j2 b/test/canaries/templates/nr-otel-collector-agent.yml.j2
@@ -191,7 +191,7 @@ processors:
 exporters:
   logging:
   otlp:
-    endpoint: staging-otlp.nr-data.net:4317
+    endpoint: https://staging-otlp.nr-data.net:4317
     headers:
       api-key: {{ nr_license_key_canaries }}