Merge pull request #22089 from danielorihuela/docs/update-agent-control-old-yamls

docs: update agent control old yamls

Author: adutta-newrelic

src/content/docs/new-relic-control/agent-control/configuration.mdx

@@ -53,46 +53,48 @@ This example shows the two layers of configuration within a single file.
     global:
       cluster: "YOUR_CLUSTER_NAME"
       licenseKey: "YOUR_LICENSE_KEY"
-      userKey: "YOUR_USER_KEY"
 
     # Values related to the Agent Control's Helm chart release.
     # `https://github.com/newrelic/helm-charts/blob/master/charts/agent-control-bootstrap/values.yaml`
-    agent-control-deployment:
-      identityClientId: ""
-      identityClientSecret: ""
-      config:
-        fleet_control:
-          # Optional: Specify a fleet_id (entity guid) to automatically connect to an existing fleet.
-          fleet_id: ""
-          auth:
-            # New Relic organization ID where agent will connect to.
-            organizationId: "YOUR_ORGANIZATION_ID"
-
-        # Layer 2: Managed Agents' Configurations
-        # List of managed agents that will be deployed. The key represents the name of the agent and the value holds the configuration.
-        subAgents:
+    agentControlDeployment:
+      chartValues:
+        systemIdentity:
+          organizationId: "****"
+          parentIdentity:
+            clientId: "****"
+            clientSecret: "****"
+        config:
+          fleet_control:
+            # Optional: Specify a fleet_id (entity guid) to automatically connect to an existing fleet.
+            fleet_id: "****"
+
+          # Layer 2: Managed Agents' Configurations
+          # List of managed agents that will be deployed. The key represents the name of the agent and the value holds the configuration.
+          agents:
+            infrastructure:
+              agent_type: newrelic/com.newrelic.infrastructure:0.1.0
+            logs:
+              agent_type: newrelic/io.fluentbit:0.1.0
+            agent-operator:
+              agent_type: com.newrelic.k8s_agent_operator:0.1.0
+
+        agentsConfig:
           infrastructure:
-            type: newrelic/com.newrelic.infrastructure:0.1.0
-            content:
-              # Ref: `https://github.com/newrelic/helm-charts/tree/master/charts/nri-bundle`
-              # Recommended: check and define an explicit chart version (latest stable)
-              chart_version: "*"
-              chart_values:
-                newrelic-infrastructure:
-                enableProcessMetrics: true
+            # Ref: `https://github.com/newrelic/helm-charts/tree/master/charts/nri-bundle`
+            # Recommended: check and define an explicit chart version (latest stable)
+            chart_version: "*"
+            chart_values:
+              newrelic-infrastructure:
+              enableProcessMetrics: true
           logs:
-            type: newrelic/io.fluentbit:0.1.0
-            content:
-              # Ref: `https://github.com/newrelic/helm-charts/tree/master/charts/newrelic-logging`
-              # Recommended: check and define an explicit chart version (latest stable)
-              chart_version: "*"
-              chart_values:
-                newrelic-logging:
-                  sendMetrics: true
+            # Ref: `https://github.com/newrelic/helm-charts/tree/master/charts/newrelic-logging`
+            # Recommended: check and define an explicit chart version (latest stable)
+            chart_version: "*"
+            chart_values:
+              newrelic-logging:
+                sendMetrics: true
           agent-operator:
-            type: com.newrelic.k8s_agent_operator:0.1.0
-            content:
-              chart_version: "*"
+            chart_version: "*"
     ```
 
   </Collapser>
@@ -132,41 +134,44 @@ This example deploys Agent Control with infrastructure monitoring and Fluent Bit
     global:
       cluster: "YOUR_CLUSTER_NAME"
       licenseKey: "YOUR_LICENSE_KEY"
-      userKey: "YOUR_USER_KEY"
 
     # See `https://github.com/newrelic/helm-charts/blob/master/charts/agent-control-bootstrap/values.yaml`
-    agent-control-deployment:
-      identityClientId: ""
-      identityClientSecret: ""
-      config:
-        fleet_control:
-          # Optional
-          # fleet_id: YOUR_FLEET_ENTITY_GUID
-          auth:
-            organizationId: "YOUR_ORGANIZATION_ID"
-        subAgents:
+    agentControlDeployment:
+      chartValues:
+        systemIdentity:
+          organizationId: "****"
+          parentIdentity:
+            clientId: "****"
+            clientSecret: "****"
+        config:
+          fleet_control:
+            # Optional: Specify a fleet_id (entity guid) to automatically connect to an existing fleet.
+            fleet_id: "****"
+          agents:
+            infrastructure:
+              agent_type: newrelic/com.newrelic.infrastructure:0.1.0
+            logs:
+              agent_type: newrelic/io.fluentbit:0.1.0
+            agent-operator:
+              agent_type: com.newrelic.k8s_agent_operator:0.1.0
+        agentsConfig:
           infrastructure:
-            type: newrelic/com.newrelic.infrastructure:0.1.0
-            content:
-              # Ref: `https://github.com/newrelic/helm-charts/tree/master/charts/nri-bundle`
-              # Recommended: check and define an explicit chart version (latest stable)
-              chart_version: "*"
-
-              #chart_values:
-              #  newrelic-infrastructure:
-              #    enableProcessMetrics: true
+            # Ref: `https://github.com/newrelic/helm-charts/tree/master/charts/nri-bundle`
+            # Recommended: check and define an explicit chart version (latest stable)
+            chart_version: "*"
+
+            #chart_values:
+            #  newrelic-infrastructure:
+            #    enableProcessMetrics: true
           logs:
-            type: newrelic/io.fluentbit:0.1.0
-            content:
-              # Ref: `https://github.com/newrelic/helm-charts/tree/master/charts/newrelic-logging`
-              # Recommended: check and define an explicit chart version (latest stable)
-              chart_version: "*"
-
-              #chart_values:
-              #  newrelic-logging:
-              #    sendMetrics: true
+            # Ref: `https://github.com/newrelic/helm-charts/tree/master/charts/newrelic-logging`
+            # Recommended: check and define an explicit chart version (latest stable)
+            chart_version: "*"
+
+            #chart_values:
+            #  newrelic-logging:
+            #    sendMetrics: true
           agent-operator:
-            type: com.newrelic.k8s_agent_operator:0.1.0
             chart_version: "*"
     ```
   </Collapser>
@@ -194,50 +199,53 @@ Security Best Practice: Do not store sensitive values like your license key dire
       licenseKey: "YOUR_LICENSE_KEY"
     # Values related to the Agent Control's Helm chart release.
     # `https://github.com/newrelic/helm-charts/blob/master/charts/agent-control-bootstrap/values.yaml`
-    agent-control-deployment:
-      identityClientId: ""
-      identityClientSecret: ""
-      config:
-        fleet_control:
-          # Optional: Specify a fleet_id (entity guid) to automatically connect to an existing fleet.
-          fleet_id: ""
-          auth:
-            # New Relic organization ID where agent will connect to.
-            organizationId: "YOUR_ORGANIZATION_ID"
-
+    agentControlDeployment:
+      chartValues:
+        systemIdentity:
+          organizationId: "****"
+          parentIdentity:
+            clientId: "****"
+            clientSecret: "****"
+        config:
+          fleet_control:
+            # Optional: Specify a fleet_id (entity guid) to automatically connect to an existing fleet.
+            fleet_id: "****"
+
+          # List of managed agents that will be deployed. The key represents the name of the agent and the value holds the configuration.
+          agents:
+            infrastructure:
+              agent_type: newrelic/com.newrelic.infrastructure:0.1.0
+            agent-operator:
+              agent_type: newrelic/com.newrelic.k8s_agent_operator:0.1.0
+            fluentbit:
+              agent_type: newrelic/io.fluentbit:0.1.0
+            prometheus:
+              agent_type: newrelic/com.newrelic.prometheus:0.1.0
         # List of managed agents that will be deployed. The key represents the name of the agent and the value holds the configuration.
-        subAgents:
+        agentsConfig:
           infrastructure:
-            type: newrelic/com.newrelic.infrastructure:0.1.0
-            content:
-              # Ref: `https://github.com/newrelic/helm-charts/tree/master/charts/nri-bundle%60
-              # Recommended: check and define an explicit chart version (latest stable)
-              chart_version: "*"
+            # Ref: `https://github.com/newrelic/helm-charts/tree/master/charts/nri-bundle%60
+            # Recommended: check and define an explicit chart version (latest stable)
+            chart_version: "*"
           agent-operator:
-            type: newrelic/com.newrelic.k8s_agent_operator:0.1.0
-            content:
-              chart_version: "*"
+            chart_version: "*"
           fluentbit:
-            type: newrelic/io.fluentbit:0.1.0
-            content:
-              # Ref: `https://github.com/newrelic/helm-charts/tree/master/charts/newrelic-logging`
-              # Recommended: check and define an explicit chart version (latest stable)
-              chart_version: "*"
-              chart_values:
-                global:
-                  lowDataMode: true
+            # Ref: `https://github.com/newrelic/helm-charts/tree/master/charts/newrelic-logging`
+            # Recommended: check and define an explicit chart version (latest stable)
+            chart_version: "*"
+            chart_values:
+              global:
+                lowDataMode: true
           prometheus:
-            type: newrelic/com.newrelic.prometheus:0.1.0
-            content:
-              chart_version: "*"
-              chart_values:
-                global:
-                  lowDataMode: true
-                newrelic-prometheus-agent:
-                  config:
-                    kubernetes:
-                      integrations_filter:
-                        enabled: false
+            chart_version: "*"
+            chart_values:
+              global:
+                lowDataMode: true
+              newrelic-prometheus-agent:
+                config:
+                  kubernetes:
+                    integrations_filter:
+                      enabled: false
     ```
 
   </Collapser>
@@ -367,13 +375,9 @@ For proxy setups using HTTPS authentication with self-signed certificates, you n
       cluster: "YOUR_CLUSTER_NAME"
       licenseKey: "YOUR_LICENSE_KEY"
 
-    agent-control-deployment:
-      config:
-        agentControl:
-          content:
-            proxy:
-              url: https://proxy-service:8080
-        subAgents: {}
+    agentControlDeployment:
+      proxy:
+        url: https://proxy-service:8080
 
       # Mount CA certificate bundle to Agent Control
       extraVolumeMounts:
@@ -385,7 +389,7 @@ For proxy setups using HTTPS authentication with self-signed certificates, you n
             secretName: ca-certs
 
     # Configure Flux components to use proxy
-    agent-control-cd:
+    agentControlCd:
       flux2:
         sourceController:
           extraEnv:
@@ -579,7 +583,7 @@ For security reasons, only explicitly enabled repositories are allowed in remote
 
     # ...
 
-    agent-control-deployment:
+    agentControlDeployment:
       config:
         allowedChartRepositoryUrl:
           - https://my-private-repository-1
@@ -602,7 +606,7 @@ chart_repository:
 Additionally, you need to configure Agent Control's Helm installation to use your private repository if the `agent-control-bootstrap` chart itself is in a private repository. This is separate from the configuration for managed agents. Refer to the `agent-control-bootstrap` Helm chart [values.yaml](https://github.com/newrelic/helm-charts/blob/master/charts/agent-control-bootstrap/values.yaml) to configure the `installationJob` section as follows:
 
 - `chartRepositoryUrl`: The URL containing your repository location.
-- `name`: The chart name if using a different chart name.
+- `chartName`: The chart name if using a different chart name.
 - `repositorySecretReferenceName` and `repositoryCertificateSecretReferenceName`: The secrets required for authenticating to your repository. See the authentication section below for details.
 
 ### 2. Set up authentication for private repositories

src/content/docs/new-relic-control/agent-control/reinstrumentation.mdx

@@ -108,54 +108,57 @@ You will modify the subAgents section of your new configuration to match the old
 global:
   cluster: "test-migration"
   licenseKey: "****"
-agent-control-deployment:
-  identityClientId: "****"
-  identityClientSecret: "****"
-  config:
-    fleet_control:
-      fleet_id: "****"
-      auth:
-        organizationId: "****"
-    subAgents:
+agentControlDeployment:
+  chartValues:
+    systemIdentity:
+      organizationId: "****"
+      parentIdentity:
+        clientId: "****"
+        clientSecret: "****"
+    config:
+      fleet_control:
+        fleet_id: "****"
+      agents:
+        logs:
+          agent_type: newrelic/io.fluentbit:0.1.0
+        infrastructure:
+          agent_type: newrelic/com.newrelic.infrastructure:0.1.0
+        prometheus:
+          agent_type: newrelic/com.newrelic.prometheus:0.1.0
+    agentsConfig:
       logs:
-        type: newrelic/io.fluentbit:0.1.0
-        content:
-          chart_version: "1.25.1"
-          chart_values:
-            newrelic-logging:
-              image:
-                tag: "latest"
-              resources:
-                limits:
-                  cpu: 200m
-                requests:
-                  cpu: 200m
+        chart_version: "1.25.1"
+        chart_values:
+          newrelic-logging:
+            image:
+              tag: "latest"
+            resources:
+              limits:
+                cpu: 200m
+              requests:
+                cpu: 200m
       infrastructure:
-        type: newrelic/com.newrelic.infrastructure:0.1.0
-        content:
-          chart_version: "5.0.109"
-          chart_values:
-            newrelic-infrastructure:
-              kubelet:
-                tolerations:
-                  - operator: "Exists"
-                    effect: "NoSchedule"
-                  - operator: "Exists"
-                    effect: "NoExecute"
-                  - operator: "Exists"
-                    key: "MyToleration"
-              ksm:
-                enabled: false
-              common:
-                config:
-                  interval: 29s
-            nri-kube-events:
-              customAttributes:
-                test_tag_label: test_tag_value
+        chart_version: "5.0.109"
+        chart_values:
+          newrelic-infrastructure:
+            kubelet:
+              tolerations:
+                - operator: "Exists"
+                  effect: "NoSchedule"
+                - operator: "Exists"
+                  effect: "NoExecute"
+                - operator: "Exists"
+                  key: "MyToleration"
+            ksm:
+              enabled: false
+            common:
+              config:
+                interval: 29s
+          nri-kube-events:
+            customAttributes:
+              test_tag_label: test_tag_value
       prometheus:
-        type: newrelic/com.newrelic.prometheus:0.1.0
-        content:
-          chart_version: "1.15.4"
+        chart_version: "1.15.4"
 ```
 
 ### Step 3. Uninstall Your Old Agents