feat: add new host_monitoring cli creating infra-agent config (#1806)

* feat: add new host_monitoring cli creating infra-agent config

* feat: move new to from infra-config to the test block

* feat: move infra_gent config to a constant.

* feat: simplify the host_monitoring tests.

* feat: improve message of why we avoid some host monitoring generate tests on windows

* feat: use agent_set instead of host_monitoring enum

* Update agent-control/src/cli/on_host/host_monitoring_gen/infra_config_gen.rs

Co-authored-by: danielorihuela <[email protected]>

* feat: Fix formatting

* feat: otel monitoring cli (#1817)

* feat: add systemd cli and otel host_monitoring cli creating otel config

* feat: rollback wrong command name change for generateConfig

* feat: move otel_endpoint to be part of the region

* feat: merge otel endpoint and license_key modification in systemd endpoint to one action

* feat: Add error handling to generate_host_monitoring_config

---------

Co-authored-by: danielorihuela <[email protected]>

Author: alvarocabanas

agent-control/src/bin/main_agent_control_onhost_cli.rs

@@ -1,6 +1,7 @@
 use std::process::ExitCode;
 
 use clap::{CommandFactory, Parser, error::ErrorKind};
+use newrelic_agent_control::cli::on_host::{host_monitoring_gen, systemd_gen};
 use newrelic_agent_control::cli::{logs, on_host::config_gen};
 use tracing::{Level, error};
 
@@ -15,10 +16,15 @@ struct Cli {
 }
 
 /// Commands supported by the cli
+#[allow(clippy::large_enum_variant)]
 #[derive(Debug, clap::Subcommand)]
 enum Commands {
     // Generate Agent Control configuration according to the provided configuration data.
     GenerateConfig(config_gen::Args),
+    // Generate Host Monitoring configuration according to the provided configuration data.
+    HostMonitoring(host_monitoring_gen::Args),
+    // Generate systemd configuration according to the provided configuration data.
+    SystemdConfig(systemd_gen::Args),
 }
 
 fn main() -> ExitCode {
@@ -39,6 +45,10 @@ fn main() -> ExitCode {
             }
             config_gen::generate_config(args)
         }
+        Commands::HostMonitoring(args) => {
+            host_monitoring_gen::generate_host_monitoring_config(args)
+        }
+        Commands::SystemdConfig(args) => systemd_gen::generate_systemd_config(args),
     };
 
     if let Err(err) = result {

agent-control/src/bin/main_config_migrate.rs

@@ -40,8 +40,8 @@ fn main() -> Result<(), Box<dyn Error>> {
                         MappingType::Dir(dir_path) => {
                             legacy_config_renamer.rename_path(dir_path.dir_path.as_path())?
                         }
-                        MappingType::File(file_path) => {
-                            legacy_config_renamer.rename_path(file_path.as_path())?
+                        MappingType::File(file_info) => {
+                            legacy_config_renamer.rename_path(file_info.file_path.as_path())?
                         }
                     }
                 }

agent-control/src/cli/on_host.rs

@@ -1 +1,4 @@
 pub mod config_gen;
+
+pub mod host_monitoring_gen;
+pub mod systemd_gen;

agent-control/src/cli/on_host/config_gen/region.rs

@@ -16,6 +16,10 @@ const PUBLIC_KEY_ENDPOINT_EU: &str =
 const PUBLIC_KEY_ENDPOINT_STAGING: &str =
     "https://staging-publickeys.newrelic.com/r/blob-management/global/agentconfiguration/jwks.json";
 
+const OTLP_URL_STAGING: &str = "staging.otlp.nr-data.net";
+const OTLP_URL_EU: &str = "otlp.eu01.nr-data.net";
+const OTLP_URL_US: &str = "otlp.nr-data.net";
+
 /// Represents the supported region and defines related fields. It cannot wrap the [Environments] enum
 /// due to clap limitations. Re-defining the enum is simpler than extending and using some mapping
 /// tool such as [clap::builder::TypedValueParser::map].
@@ -74,6 +78,16 @@ impl Region {
         .expect("known uris should be valid")
     }
 
+    pub fn otel_endpoint(&self) -> Uri {
+        match &self {
+            Self::US => OTLP_URL_US,
+            Self::EU => OTLP_URL_EU,
+            Self::STAGING => OTLP_URL_STAGING,
+        }
+        .parse()
+        .expect("known uris should be valid")
+    }
+
     // Helper to obtain the token renewal endpoint that is also needed in Agent Control configuration
     pub fn token_renewal_endpoint(&self) -> Uri {
         NewRelicEnvironment::from(self.to_owned()).token_renewal_endpoint()
@@ -144,6 +158,17 @@ mod tests {
         );
     }
 
+    #[rstest]
+    #[case(Region::US, "otlp.nr-data.net")]
+    #[case(Region::EU, "otlp.eu01.nr-data.net")]
+    #[case(Region::STAGING, "staging.otlp.nr-data.net")]
+    fn test_otel_endpoint(#[case] region: Region, #[case] expected_endpoint: &str) {
+        assert_eq!(
+            region.otel_endpoint().to_string(),
+            expected_endpoint.to_string()
+        );
+    }
+
     #[rstest]
     #[case("us", Region::US)]
     #[case("US", Region::US)]

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

@@ -0,0 +1,61 @@
+//! Implementation of the generate-config command for the on-host cli.
+
+use crate::cli::error::CliError;
+use crate::cli::on_host::config_gen::config::AgentSet;
+use crate::cli::on_host::config_gen::region::{Region, region_parser};
+use crate::cli::on_host::host_monitoring_gen::infra_config_gen::InfraConfigGenerator;
+use crate::cli::on_host::host_monitoring_gen::otel_config_gen::OtelConfigGen;
+use tracing::info;
+
+pub mod infra_config;
+pub mod infra_config_gen;
+pub mod otel_config_gen;
+
+/// Generates the Agent Control configuration for host environments.
+#[derive(Debug, clap::Parser)]
+pub struct Args {
+    /// Agent to be used for host monitoring.
+    #[arg(long, required = true)]
+    agent_set: AgentSet,
+
+    /// Custom Attributes
+    #[arg(long)]
+    custom_attributes: Option<String>,
+
+    /// Proxy configuration
+    #[arg(long)]
+    proxy: Option<String>,
+
+    /// New Relic region
+    #[arg(long, value_parser = region_parser(), required = true)]
+    region: Region,
+}
+
+/// Generates the Host monitoring values either infra-agent or otel.
+pub fn generate_host_monitoring_config(args: Args) -> Result<(), CliError> {
+    info!("Generating Host monitoring values");
+
+    match args.agent_set {
+        AgentSet::InfraAgent => {
+            let infra_config_generator = InfraConfigGenerator::default();
+
+            infra_config_generator
+                .generate_infra_config(args.region, args.custom_attributes, args.proxy)
+                .map_err(|err| {
+                    CliError::Command(format!("failed generating infra config: {err}"))
+                })?;
+        }
+        AgentSet::Otel => {
+            let otel_config_generator = OtelConfigGen::default();
+            otel_config_generator
+                .generate_otel_config()
+                .map_err(|err| {
+                    CliError::Command(format!("failed generating otel config: {err}"))
+                })?;
+        }
+        _ => {}
+    }
+
+    info!("Host monitoring values generated successfully");
+    Ok(())
+}