Address feedback

Author: dhurley

src/core/config/config.go

@@ -354,7 +354,9 @@ func getNginx() Nginx {
 		NginxClientVersion:           Viper.GetInt(NginxClientVersion),
 		ConfigReloadMonitoringPeriod: Viper.GetDuration(NginxConfigReloadMonitoringPeriod),
 		TreatWarningsAsErrors:        Viper.GetBool(NginxTreatWarningsAsErrors),
-		Ca:                           Viper.GetString(NginxCa),
+		ApiTls: TLSConfig{
+			Ca: Viper.GetString(NginxApiTlsCa),
+		},
 	}
 }
 

src/core/config/defaults.go

@@ -66,7 +66,9 @@ var (
 			NginxClientVersion:           7, // NGINX Plus R25+
 			ConfigReloadMonitoringPeriod: 10 * time.Second,
 			TreatWarningsAsErrors:        false,
-			Ca:                           "",
+			ApiTls: TLSConfig{
+				Ca: "",
+			},
 		},
 		ConfigDirs:            "/etc/nginx:/usr/local/etc/nginx:/usr/share/nginx/modules:/etc/nms",
 		IgnoreDirectives:      []string{},
@@ -176,7 +178,7 @@ const (
 	NginxClientVersion                = NginxKey + agent_config.KeyDelimiter + "client_version"
 	NginxConfigReloadMonitoringPeriod = NginxKey + agent_config.KeyDelimiter + "config_reload_monitoring_period"
 	NginxTreatWarningsAsErrors        = NginxKey + agent_config.KeyDelimiter + "treat_warnings_as_errors"
-	NginxCa                           = NginxKey + agent_config.KeyDelimiter + "ca"
+	NginxApiTlsCa                     = NginxKey + agent_config.KeyDelimiter + "api_tls_ca"
 
 	// viper keys used in config
 	DataplaneKey = "dataplane"
@@ -324,9 +326,9 @@ var (
 			DefaultValue: Defaults.Nginx.TreatWarningsAsErrors,
 		},
 		&StringFlag{
-			Name:         NginxCa,
+			Name:         NginxApiTlsCa,
 			Usage:        "The NGINX Plus CA certificate file location needed to call the NGINX Plus API if SSL is enabled.",
-			DefaultValue: Defaults.Nginx.Ca,
+			DefaultValue: Defaults.Nginx.ApiTls.Ca,
 		},
 		// Metrics
 		&DurationFlag{

src/core/config/types.go

@@ -155,7 +155,7 @@ type Nginx struct {
 	NginxClientVersion           int           `mapstructure:"client_version" yaml:"-"`
 	ConfigReloadMonitoringPeriod time.Duration `mapstructure:"config_reload_monitoring_period" yaml:"-"`
 	TreatWarningsAsErrors        bool          `mapstructure:"treat_warnings_as_errors" yaml:"-"`
-	Ca                           string        `mapstructure:"ca" yaml:"-"`
+	ApiTls                       TLSConfig     `mapstructure:"api_tls" yaml:"-"`
 }
 
 type Dataplane struct {

src/core/metrics/sources/nginx_plus.go

@@ -87,8 +87,8 @@ func NewNginxPlus(baseDimensions *metrics.CommonDim, nginxNamespace, plusNamespa
 
 	client := http.DefaultClient
 
-	if conf.Nginx.Ca != "" && conf.IsFileAllowed(conf.Nginx.Ca) {
-		data, err := os.ReadFile(conf.Nginx.Ca)
+	if conf.Nginx.ApiTls.Ca != "" && conf.IsFileAllowed(conf.Nginx.ApiTls.Ca) {
+		data, err := os.ReadFile(conf.Nginx.ApiTls.Ca)
 		if err != nil {
 			log.Errorf("Unable to collect NGINX Plus metrics. Failed to read NGINX CA certificate file: %v", err)
 			return nil