fix: nrdot onhost agent

Author: gsanchezgavier

agent-control/agent-type-registry/newrelic/com.newrelic.opentelemetry.collector-0.1.0.yaml

@@ -90,7 +90,6 @@ deployment:
         path: /usr/bin/nrdot-collector-host
         args: >-
           --config=${nr-sub:autogenerated_agent_dir}/otel-config/config.yaml
-          --feature-gates=-pkg.translator.prometheus.NormalizeName
         env:
           # sets the otel-collector "env" source resource detector
           OTEL_RESOURCE_ATTRIBUTES: "host.id=${nr-ac:host_id}"

agent-control/agent-type-registry/newrelic/io.opentelemetry.collector-0.1.0.yaml

@@ -93,7 +93,6 @@ deployment:
         path: /usr/bin/nrdot-collector-host
         args: >-
           --config=${nr-sub:autogenerated_agent_dir}/otel-config/config.yaml
-          --feature-gates=-pkg.translator.prometheus.NormalizeName
         env:
           # sets the otel-collector "env" source resource detector
           OTEL_RESOURCE_ATTRIBUTES: "host.id=${nr-ac:host_id}"

agent-control/src/cli/on_host/host_monitoring_gen/otel_config_gen.rs

@@ -12,7 +12,7 @@ impl Default for OtelConfigGen {
     fn default() -> Self {
         Self {
             otel_agent_values_path: PathBuf::from(
-                "/etc/newrelic-agent-control/fleet/agents.d/nr-otel-collector/values",
+                "/etc/newrelic-agent-control/fleet/agents.d/nrdot/values",
             ),
             otel_config_source_path: PathBuf::from(
                 "/etc/newrelic-agent-control/examples/values-nr-otel-collector-agent-linux.yaml",
@@ -83,9 +83,7 @@ mod tests {
     #[test]
     fn test_generate_otel_config_creates_directories_and_copies_file() {
         let temp_dir = tempdir().unwrap();
-        let temp_values_dir = temp_dir
-            .path()
-            .join("fleet/agents.d/nr-otel-collector/values");
+        let temp_values_dir = temp_dir.path().join("fleet/agents.d/nrdot/values");
         let temp_example_file = temp_dir
             .path()
             .join("values-nr-otel-collector-agent-linux.yaml");

build/example_templates/values-nr-otel-collector-agent-linux.yaml

@@ -1,2 +1,2 @@
-config: |
+config:
   {{ OTEL_COLLECTOR_CONFIG }}

test/onhost-e2e/Makefile

@@ -2,7 +2,7 @@
 include ../Ansible.common
 
 LOCAL_PACKAGE_PATH ?= $(CURDIR)/../../dist
-RECIPE_BRANCH ?= main
+RECIPE_BRANCH ?= NR_483970_use_cli_host_monitoring
 
 # Variables dependent on the New Relic platform region.
 OPAMP_ENDPOINT = "https://opamp.staging-service.newrelic.com/v1/opamp"

test/onhost-e2e/Readme.md

@@ -31,13 +31,17 @@ The Vagrant VM can be launched using `vagrant up` from the same folder where the
 
 ## Execution
 ```sh
+# In case you want to execute the e2e using the current commit AC, run the package creation with a tag
+# that doesn't match with any in the prod repo. 
+GORELEASER_CURRENT_TAG=9.0.0 NR_RELEASE_TAG=9.0.0 goreleaser release --skip sign --skip publish --skip validate --clean
+
 make test/onhost-e2e \
+  PACKAGE_VERSION="<9.0.0(build from current branch) or upstream prod version>"\
   NR_LICENSE_KEY=$LICENSE_KEY \
   NEW_RELIC_ACCOUNT_ID=$ACCOUNT_ID \
   NEW_RELIC_API_KEY=$API_REST_KEY \
   NR_ORGANIZATION_ID=$ORGANIZATION_ID \
   NR_SYSTEM_IDENTITY_CLIENT_ID=$SYSTEM_IDENTITY_CLIENT_ID \
   NR_SYSTEM_IDENTITY_PRIVATE_KEY=$SYSTEM_IDENTITY_PRIVATE_KEY \
-  REPOSITORY_ENDPOINT="http://nr-downloads-ohai-staging.s3.amazonaws.com/" \
   ANSIBLE_PLAYBOOK=<test playbook>.yaml
 ```

test/onhost-e2e/ansible/nrdot_agent.yaml

@@ -0,0 +1,72 @@
+---
+- name: Test nrdot
+  hosts: 127.0.0.1
+  connection: local
+  become: true
+  gather_facts: yes
+
+  tasks:
+    - name: Test nrdot
+      block:
+        - name: Cleanup
+          include_tasks: ./tasks/clean_all.yaml
+
+        - name: Install Agent Control
+          include_role:
+            name: install_ac_recipe
+          vars:
+            recipe_list: "agent-control"
+            monitoring_source: "otel"
+            fleet_enabled: "false"
+
+        - name: Set test identifier
+          set_fact:
+            test_id: "onhost-e2e-nrdot_{{ lookup('pipe', 'date +%Y-%m-%d_%H-%M-%S') }}"
+
+        - name: Setup AC config
+          include_role:
+            name: edit_yaml_config
+          vars:
+            config_path: "/etc/newrelic-agent-control/config.yaml"
+            update_config:
+              # fixing the host id to identify the test instance. The approach here is different than other 
+              # test because is less complex and intrusive that adding the attribute to the processor in nrdot.
+              host_id: "{{ test_id }}"
+              log:
+                format:
+                  formatter: pretty
+                  target: true
+                level: debug
+
+        - name: Restart Agent Control
+          include_role:
+            name: caos.ansible_roles.service_status
+          vars:
+            service_name: "newrelic-agent-control"
+            action: "restart"
+
+        - name: Assert that nrdot is reporting
+          include_role:
+            name: nrql_api_request
+            apply:
+              become: false
+          vars:
+            nrql_query: >-
+              SELECT `system.memory.utilization`
+              FROM Metric
+              WHERE `host.id` = '{{ test_id }}'
+              LIMIT 1
+            retries: 120
+            delay: 10
+            
+      always:
+        - name: AC logs
+          shell: journalctl -u newrelic-agent-control --no-pager
+          register: ac_logs
+
+        - name: Debug AC logs
+          debug:
+            var: ac_logs.stdout_lines
+
+        - name: Cleanup
+          include_tasks: ./tasks/clean_all.yaml