diff --git a/build/linux/installer/conf/telegraf-prom-side-car.conf b/build/linux/installer/conf/telegraf-prom-side-car.conf index b3b4ba1d3..1b6bab9f9 100644 --- a/build/linux/installer/conf/telegraf-prom-side-car.conf +++ b/build/linux/installer/conf/telegraf-prom-side-car.conf @@ -109,7 +109,7 @@ ## more about them here: ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md data_format = "json" - namedrop = ["agent_telemetry"] + namedrop = ["agent_telemetry", "file"] ############################################################################### # PROCESSOR PLUGINS # @@ -119,6 +119,12 @@ [processors.converter.fields] float = ["*"] +# Dummy plugin to test out toml parsing happens properly +[[inputs.file]] + interval = "24h" + files = ["test.json"] + data_format = "json" + #Prometheus Custom Metrics [[inputs.prometheus]] interval = "$AZMON_TELEGRAF_CUSTOM_PROM_INTERVAL" diff --git a/build/linux/installer/conf/telegraf-rs.conf b/build/linux/installer/conf/telegraf-rs.conf index ee1cf8819..0ca07f7e5 100644 --- a/build/linux/installer/conf/telegraf-rs.conf +++ b/build/linux/installer/conf/telegraf-rs.conf @@ -121,7 +121,7 @@ ## more about them here: ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md data_format = "json" - namedrop = ["agent_telemetry"] + namedrop = ["agent_telemetry", "file"] #tagdrop = ["AgentVersion","AKS_RESOURCE_ID", "ACS_RESOURCE_NAME", "Region","ClusterName","ClusterType", "Computer", "ControllerType"] [[outputs.application_insights]] @@ -538,6 +538,12 @@ #tagexclude = ["AgentVersion","AKS_RESOURCE_ID","ACS_RESOURCE_NAME", "Region", "ClusterName", "ClusterType", "Computer", "ControllerType"] # [inputs.prometheus.tagpass] +# Dummy plugin to test out toml parsing happens properly +[[inputs.file]] + interval = "24h" + files = ["test.json"] + data_format = "json" + #Prometheus Custom Metrics [[inputs.prometheus]] interval = "$AZMON_TELEGRAF_CUSTOM_PROM_INTERVAL" diff --git a/build/linux/installer/conf/telegraf.conf b/build/linux/installer/conf/telegraf.conf index 5a5bb2d8c..8b6e2ad4b 100644 --- a/build/linux/installer/conf/telegraf.conf +++ b/build/linux/installer/conf/telegraf.conf @@ -120,7 +120,7 @@ ## more about them here: ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md data_format = "json" - namedrop = ["agent_telemetry"] + namedrop = ["agent_telemetry", "file"] #tagdrop = ["AgentVersion","AKS_RESOURCE_ID", "ACS_RESOURCE_NAME", "Region","ClusterName","ClusterType", "Computer", "ControllerType"] # Output to send MDM metrics to fluent bit and then route it to fluentD @@ -425,7 +425,11 @@ # fieldpass = ["usage_active","cluster","node","host","device"] # taginclude = ["cluster","cpu","node"] - +# Dummy plugin to test out toml parsing happens properly +[[inputs.file]] + interval = "24h" + files = ["test.json"] + data_format = "json" # Read metrics about disk usage by mount point [[inputs.disk]] diff --git a/build/linux/installer/conf/test.json b/build/linux/installer/conf/test.json new file mode 100644 index 000000000..9e26dfeeb --- /dev/null +++ b/build/linux/installer/conf/test.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/build/linux/installer/datafiles/base_container.data b/build/linux/installer/datafiles/base_container.data index 88c790be3..bdacf647d 100644 --- a/build/linux/installer/datafiles/base_container.data +++ b/build/linux/installer/datafiles/base_container.data @@ -36,6 +36,7 @@ MAINTAINER: 'Microsoft Corporation' /etc/opt/microsoft/docker-cimprov/td-agent-bit-rs.conf; build/linux/installer/conf/td-agent-bit-rs.conf; 644; root; root /etc/opt/microsoft/docker-cimprov/azm-containers-parser.conf; build/linux/installer/conf/azm-containers-parser.conf; 644; root; root /etc/opt/microsoft/docker-cimprov/out_oms.conf; build/linux/installer/conf/out_oms.conf; 644; root; root +/etc/opt/microsoft/docker-cimprov/test.json; build/linux/installer/conf/test.json; 644; root; root /etc/opt/microsoft/docker-cimprov/telegraf.conf; build/linux/installer/conf/telegraf.conf; 644; root; root /etc/opt/microsoft/docker-cimprov/telegraf-prom-side-car.conf; build/linux/installer/conf/telegraf-prom-side-car.conf; 644; root; root /etc/opt/microsoft/docker-cimprov/telegraf-rs.conf; build/linux/installer/conf/telegraf-rs.conf; 644; root; root @@ -53,6 +54,8 @@ MAINTAINER: 'Microsoft Corporation' /opt/ConfigParseErrorLogger.rb; build/common/installer/scripts/ConfigParseErrorLogger.rb; 755; root; root /opt/tomlparser-npm-config.rb; build/linux/installer/scripts/tomlparser-npm-config.rb; 755; root; root /opt/tomlparser-osm-config.rb; build/linux/installer/scripts/tomlparser-osm-config.rb; 755; root; root +/opt/test.json; build/linux/installer/conf/test.json; 644; root; root + /etc/opt/microsoft/docker-cimprov/health/healthmonitorconfig.json; build/linux/installer/conf/healthmonitorconfig.json; 644; root; root diff --git a/kubernetes/linux/main.sh b/kubernetes/linux/main.sh index ec348bba3..1a7034d4d 100644 --- a/kubernetes/linux/main.sh +++ b/kubernetes/linux/main.sh @@ -504,17 +504,19 @@ fi if [ ! -e "/etc/config/kube.conf" ]; then if [ "${CONTAINER_TYPE}" == "PrometheusSidecar" ] && [ -e "/opt/telegraf-test-prom-side-car.conf" ]; then echo "****************Start Telegraf in Test Mode**************************" - /opt/telegraf --config /opt/telegraf-test-prom-side-car.conf -test + /opt/telegraf --config /opt/telegraf-test-prom-side-car.conf --input-filter file -test if [ $? -eq 0 ]; then mv "/opt/telegraf-test-prom-side-car.conf" "/etc/opt/microsoft/docker-cimprov/telegraf-prom-side-car.conf" + echo "Moving test conf file to telegraf side-car conf since test run succeeded" fi echo "****************End Telegraf Run in Test Mode**************************" else if [ -e "/opt/telegraf-test.conf" ]; then echo "****************Start Telegraf in Test Mode**************************" - /opt/telegraf --config /opt/telegraf-test.conf -test + /opt/telegraf --config /opt/telegraf-test.conf --input-filter file -test if [ $? -eq 0 ]; then mv "/opt/telegraf-test.conf" "/etc/opt/microsoft/docker-cimprov/telegraf.conf" + echo "Moving test conf file to telegraf daemonset conf since test run succeeded" fi echo "****************End Telegraf Run in Test Mode**************************" fi @@ -522,9 +524,10 @@ if [ ! -e "/etc/config/kube.conf" ]; then else if [ -e "/opt/telegraf-test-rs.conf" ]; then echo "****************Start Telegraf in Test Mode**************************" - /opt/telegraf --config /opt/telegraf-test-rs.conf -test + /opt/telegraf --config /opt/telegraf-test-rs.conf --input-filter file -test if [ $? -eq 0 ]; then mv "/opt/telegraf-test-rs.conf" "/etc/opt/microsoft/docker-cimprov/telegraf-rs.conf" + echo "Moving test conf file to telegraf replicaset conf since test run succeeded" fi echo "****************End Telegraf Run in Test Mode**************************" fi