@@ -5,22 +5,19 @@ variables:
55 on_host :
66 config_agent :
77 description : " Newrelic infra configuration"
8- type : file
8+ type : yaml
99 required : false
10- default : " "
11- file_path : " newrelic-infra.yml"
10+ default : {}
1211 config_integrations :
13- description : " map of YAML configs for the OHIs"
14- type : map[string]file
12+ description : " YAML configs for the OHIs"
13+ type : yaml
1514 required : false
16- default : { }
17- file_path : " integrations.d"
15+ default : {}
1816 config_logging :
19- description : " map of YAML config for logging"
20- type : map[string]file
17+ description : " YAML config for logging"
18+ type : yaml
2119 required : false
22- default : { }
23- file_path : " logging.d"
20+ default : {}
2421 backoff_delay :
2522 description : " seconds until next retry if agent fails to start"
2623 type : string
@@ -48,28 +45,28 @@ variables:
4845 description : " newrelic-infrastructure chart values"
4946 type : yaml
5047 required : false
51- default : { }
48+ default : {}
5249 nri-metadata-injection :
5350 description : " nri-metadata-injection chart values"
5451 type : yaml
5552 required : false
56- default : { }
53+ default : {}
5754 kube-state-metrics :
5855 description : " kube-state-metrics chart values"
5956 type : yaml
6057 required : false
61- default : { }
58+ default : {}
6259 nri-kube-events :
6360 description : " nri-kube-events chart values"
6461 type : yaml
6562 required : false
66- default : { }
63+ default : {}
6764 # Global values must have their own key, even if there is only one sub-chart.
6865 global :
6966 description : " Global chart values"
7067 type : yaml
7168 required : false
72- default : { }
69+ default : {}
7370 # HelmChart based sub agents should always have `chart_version`.
7471 chart_version :
7572 description : " nri-bundle chart version"
@@ -101,7 +98,6 @@ variables:
10198 type : yaml
10299 required : false
103100 default : null
104-
105101deployment :
106102 on_host :
107103 enable_file_logging : ${nr-var:enable_file_logging}
@@ -112,13 +108,26 @@ deployment:
112108 http :
113109 path : " /v1/status/health"
114110 port : ${nr-var:health_port}
111+ filesystem :
112+ config :
113+ path : newrelic-infra.yaml
114+ content : |
115+ ${nr-var:config_agent}
116+ integrations :
117+ path : integrations.d/integrations.yaml
118+ content : |
119+ ${nr-var:config_integrations}
120+ logging :
121+ path : logging/logging.yaml
122+ content : |
123+ ${nr-var:config_logging}
115124 executables :
116125 - path : /usr/bin/newrelic-infra
117126 args : >-
118- --config=${nr-var:config_agent}
127+ --config=${nr-sub:agent_dir}/newrelic-infra.yaml
119128 env :
120- NRIA_PLUGIN_DIR : " ${nr-var:config_integrations} "
121- NRIA_LOGGING_CONFIGS_DIR : " ${nr-var:config_logging} "
129+ NRIA_PLUGIN_DIR : " ${nr-sub:agent_dir}/integrations.d "
130+ NRIA_LOGGING_CONFIGS_DIR : " ${nr-sub:agent_dir}/logging "
122131 NRIA_STATUS_SERVER_ENABLED : true
123132 NRIA_STATUS_SERVER_PORT : " ${nr-var:health_port}"
124133 NR_HOST_ID : " ${nr-ac:host_id}"
@@ -211,7 +220,7 @@ deployment:
211220 newrelic-prometheus-agent:
212221 enabled: false
213222 newrelic-k8s-metrics-adapter:
214- enabled: false
223+ enabled: false
215224 # Flux [HelmRelease](https://fluxcd.io/flux/components/helmreleases/) that installs the nri-bundle chart.
216225 release :
217226 apiVersion : helm.toolkit.fluxcd.io/v2
@@ -235,7 +244,7 @@ deployment:
235244 chart : ${nr-var:chart_name}
236245 # This is where the chart version to be installed is defined. Whenever AC updates this Flux triggers a reconciliation.
237246 version : ${nr-var:chart_version}
238- # This value gets rendered even if not specified so, even 'ChartVersion' is the default, it is required to specify
247+ # This value gets rendered even if not specified so, even 'ChartVersion' is the default, it is required to specify
239248 # it to avoid the drift detection on AC supervisor, and trigger re-apply on each interval.
240249 reconcileStrategy : ChartVersion
241250 sourceRef :
0 commit comments