diff --git a/.pipelines/azure-pipeline-build.yml b/.pipelines/azure-pipeline-build.yml
index 19a566814..19669174a 100644
--- a/.pipelines/azure-pipeline-build.yml
+++ b/.pipelines/azure-pipeline-build.yml
@@ -24,7 +24,6 @@ variables:
   IS_PR: $[eq(variables['Build.Reason'], 'PullRequest')]
   IS_MAIN_BRANCH: $[eq(variables['Build.SourceBranchName'], 'main')]
 
-
 stages:
 - stage: Build
   jobs:
@@ -1330,4 +1329,4 @@ stages:
                 exit 1
               fi
             workingDirectory: $(Build.SourcesDirectory)
-            displayName: "Run tests"
\ No newline at end of file
+            displayName: "Run tests"
diff --git a/.trivyignore b/.trivyignore
index c69968542..cd719bbad 100644
--- a/.trivyignore
+++ b/.trivyignore
@@ -6,15 +6,10 @@
 
 # =========== HIGH ================
 # HIGH - otelcollector
-# HIGH - telegraf
 GHSA-fr2g-9hjm-wr23
 # HIGH - promconfigvalidator
-# HIGH - telegraf
+# HIGH - go vulnerabilities
 CVE-2023-39325
-GHSA-m425-mq94-257g
-CVE-2023-47090
-CVE-2023-46129
-CVE-2024-21626
 
 # =========== MEDIUM ================
 # MEDIUM - otelcollector
@@ -25,22 +20,9 @@ CVE-2023-48795
 CVE-2024-24786
 CVE-2024-24557
 CVE-2024-27281
-# MEDIUM - telegraf
-GHSA-jq35-85cj-fj4p
-GHSA-7ww5-4wqc-m92c
-GHSA-mhpq-9638-x6pw
-CVE-2024-27304
-GHSA-7jwh-3vrq-q3m8
-CVE-2023-50658
-CVE-2023-48795
+# MEDIUM - go vulnerabilities
 CVE-2023-3978
 CVE-2023-44487
-CVE-2023-50658
-CVE-2024-28110
-CVE-2024-27289
-CVE-2024-24557
-CVE-2024-29018
-# MEDIUM - go vulnerabilities
 # MEDIUM - mariner
 CVE-2023-5678
 # MEDIUM - ruby
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 60bcd3341..59a6faaa4 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -2,10 +2,10 @@
 
 ## Release 04-08-2024
 
-* Linux image - `mcr.microsoft.com/azuremonitor/containerinsights/ciprod/prometheus-collector/images:<tbd>`
-* Windows image - `mcr.microsoft.com/azuremonitor/containerinsights/ciprod/prometheus-collector/images:<tbd>`
-* TA image - `mcr.microsoft.com/azuremonitor/containerinsights/ciprod/prometheus-collector/images:<tbd>`
-* cfg sidecar image - `mcr.microsoft.com/azuremonitor/containerinsights/ciprod/prometheus-collector/images:<tbd>`
+* Linux image - `mcr.microsoft.com/azuremonitor/containerinsights/ciprod/prometheus-collector/images:6.8.7-main-04-09-2024-82adbf97`
+* Windows image - `mcr.microsoft.com/azuremonitor/containerinsights/ciprod/prometheus-collector/images:6.8.7-main-04-09-2024-82adbf97-win`
+* TA image - `mcr.microsoft.com/azuremonitor/containerinsights/ciprod/prometheus-collector/images:6.8.7-main-04-09-2024-82adbf97-targetallocator`
+* cfg sidecar image - `mcr.microsoft.com/azuremonitor/containerinsights/ciprod/prometheus-collector/images:6.8.7-main-04-09-2024-82adbf97-cfg`
 * Change log -
   * fix: Fix: For Arc, use a default value CloudEnvironment that customers can change for other clouds- https://github.com/Azure/prometheus-collector/pull/753
   * Upgrade: fluent-bit from 2.0.9 to 2.1.10 - https://github.com/Azure/prometheus-collector/pull/809
@@ -25,9 +25,9 @@
 ## Release 03-08-2024
 
 * Linux image - `mcr.microsoft.com/azuremonitor/containerinsights/ciprod/prometheus-collector/images:6.8.6-main-03-08-2024-fd4f13cb`
-* Windows image - `mcr.microsoft.com/azuremonitor/containerinsights/ciprod/prometheus-collector/images:6.8.6-main-03-08-2024-fd4f13cb-cfg`
+* Windows image - `mcr.microsoft.com/azuremonitor/containerinsights/ciprod/prometheus-collector/images:6.8.6-main-03-08-2024-fd4f13cb-win`
 * TA image - `mcr.microsoft.com/azuremonitor/containerinsights/ciprod/prometheus-collector/images:6.8.6-main-03-08-2024-fd4f13cb-targetallocator`
-* cfg sidecar image - `mcr.microsoft.com/azuremonitor/containerinsights/ciprod/prometheus-collector/images:6.8.6-main-03-08-2024-fd4f13cb-win`
+* cfg sidecar image - `mcr.microsoft.com/azuremonitor/containerinsights/ciprod/prometheus-collector/images:6.8.6-main-03-08-2024-fd4f13cb-cfg`
 * Change log -
   * fix: Fix for yaml unmarshal bug for keepequal/dropequal - https://github.com/Azure/prometheus-collector/pull/753
   * fix: dollar fix for TA - https://github.com/Azure/prometheus-collector/pull/769
diff --git a/otelcollector/build/linux/Dockerfile b/otelcollector/build/linux/Dockerfile
index 932d97f16..2f8508cef 100644
--- a/otelcollector/build/linux/Dockerfile
+++ b/otelcollector/build/linux/Dockerfile
@@ -72,7 +72,6 @@ COPY --from=prom-config-validator-builder /src/prom-config-validator-builder/pro
 
 COPY ./scripts/*.sh $tmpdir/
 COPY ./metricextension/me.config ./metricextension/me_internal.config ./metricextension/me_ds.config ./metricextension/me_ds_internal.config /usr/sbin/
-COPY ./telegraf/ $tmpdir/telegraf/
 COPY ./fluent-bit/fluent-bit.conf ./fluent-bit/fluent-bit-daemonset.conf ./fluent-bit/fluent-bit-parsers.conf $tmpdir/fluent-bit/
 COPY --from=fluent-bit-builder /src/out_appinsights.so $tmpdir/fluent-bit/bin/
 COPY ./react /static/react
@@ -131,7 +130,6 @@ COPY --from=builder /usr/bin/inotifywait /usr/bin/inotifywait
 COPY --from=builder /usr/bin/bash /usr/bin/bash
 COPY --from=builder /usr/sbin/busybox /usr/sbin/busybox
 COPY --from=builder /usr/bin/fluent-bit /usr/bin/fluent-bit
-COPY --from=builder /usr/bin/telegraf /usr/bin/telegraf
 COPY --from=builder /usr/sbin/crond /usr/sbin/crond
 COPY --from=builder /usr/bin/vim /usr/bin/vim
 COPY --from=builder /usr/share/vim /usr/share/vim
@@ -164,8 +162,6 @@ COPY --from=builder /lib64/libuuid.so.1 /lib64
 # fluent-bit dependencies
 # libssl.so.1.1 & libcrypto.so.1.1 are already available with openssl in distroless and copying them over causes FIPS HMAC verification failures
 COPY --from=builder /lib/libyaml-0.so.2 /lib/libsystemd.so.0 /lib/libcurl.so.4 /lib/libm.so.6 /lib/libz.so.1 /lib/libzstd.so.1 /lib/libsasl2.so.3 /lib/libgcc_s.so.1 /lib/libc.so.6 /lib/liblzma.so.5 /lib/liblz4.so.1  /lib/libcap.so.2 /lib/libgcrypt.so.20 /lib/libnghttp2.so.14 /lib/libssh2.so.1 /lib/libgssapi_krb5.so.2 /lib/libresolv.so.2 /lib/libgpg-error.so.0 /usr/lib/libkrb5.so.3 /usr/lib/libk5crypto.so.3 /usr/lib/libcom_err.so.2 /usr/lib/libkrb5support.so.0 /lib/
-# telegraf dependencies
-COPY --from=builder /lib/libc.so.6 /lib/
 # mdsd dependencies
 COPY --from=builder /usr/lib/libdl.so.2 /usr/lib/librt.so.1 /usr/lib/libpthread.so.0 /usr/lib/libm.so.6 /usr/lib/libstdc++.so.6 /usr/lib/libgcc_s.so.1 /usr/lib/
 # logrotate dependencies
diff --git a/otelcollector/fluent-bit/fluent-bit-daemonset.conf b/otelcollector/fluent-bit/fluent-bit-daemonset.conf
index 5540619f1..7b750ff2a 100644
--- a/otelcollector/fluent-bit/fluent-bit-daemonset.conf
+++ b/otelcollector/fluent-bit/fluent-bit-daemonset.conf
@@ -130,6 +130,49 @@
     Skip_Long_Lines On
     Ignore_Older 2m
 
+[INPUT]
+    Name          proc
+    Proc_Name     otelcollector
+    Interval_Sec  10
+    Tag           proc.otelcollector.memvmrss.scrape
+
+[INPUT]
+    Name          proc
+    Proc_Name     metricsextension
+    Interval_Sec  10
+    Tag           proc.metricsextension.memvmrss.scrape
+
+[INPUT]
+    name prometheus_scrape
+    host localhost
+    port 8888
+    tag          promscrape.prometheus.8888
+    scrape_interval 10s
+
+[INPUT]
+    name prometheus_scrape
+    host localhost
+    port 9090
+    tag           promscrape.prometheus.9090
+    scrape_interval 10s
+
+[INPUT]
+    name prometheus_scrape
+    host ama-metrics-operator-targets.kube-system.svc.cluster.local
+    port 80
+    tag           promscrape.prometheus.operator
+    scrape_interval 10s
+
+[INPUT]
+    Name cpu
+    Tag  cpu.otelcollector
+    PID  ${OTEL_PID}
+
+[INPUT]
+    Name cpu
+    Tag  cpu.me
+    PID  ${ME_PID}
+
 # Send log lines that contain the telemetry we want to a different tag
 # to then send to customMetrics table
 [FILTER]
@@ -201,3 +244,98 @@
     Format                          json_lines
     json_date_key                   time
     Match                           prometheus.log.noconfiguration
+
+[OUTPUT]
+    Name file
+    Match proc.*
+    Path /opt/fluent-bit
+    File proc.log
+
+[OUTPUT]
+    Name file
+    Match promscrape.*
+    Path /opt/fluent-bit
+    File promscrape.log
+
+[OUTPUT]
+    Name file
+    Match cpu.otelcollector
+    Path /opt/fluent-bit
+    File otelcpu.log
+
+[OUTPUT]
+    Name file
+    Match cpu.me
+    Path /opt/fluent-bit
+    File mecpu.log
+
+[INPUT]
+    Name tail
+    Path /opt/fluent-bit/proc.log
+    Read_from_Head true
+    Tag proc.scrape
+    Parser proc-parser
+    Mem_Buf_Limit 1m
+    Path_Key filepath
+    Skip_Long_Lines On
+    Ignore_Older 2m
+
+[INPUT]
+    Name tail
+    Path /opt/fluent-bit/promscrape.log
+    Read_from_Head true
+    Tag promscrape.scrape
+    Parser promscrape-parser
+    Mem_Buf_Limit 1m
+    Path_Key filepath
+    Skip_Long_Lines On
+    Ignore_Older 2m
+
+
+[INPUT]
+    Name tail
+    Path /opt/fluent-bit/otelcpu.log
+    Read_from_Head true
+    Tag cpu.otel
+    Parser cpu-parser
+    Mem_Buf_Limit 1m
+    Path_Key filepath
+    Skip_Long_Lines On
+    Ignore_Older 2m
+
+[INPUT]
+    Name tail
+    Path /opt/fluent-bit/mecpu.log
+    Read_from_Head true
+    Tag cpu.metricsextension
+    Parser cpu-parser
+    Mem_Buf_Limit 1m
+    Path_Key filepath
+    Skip_Long_Lines On
+    Ignore_Older 2m
+
+[FILTER]
+    Name   rewrite_tag
+    Match  proc.scrape
+    Rule   $message .*otelcollector.* procai.otelcollector.memvmrss.scrape false
+
+[FILTER]
+    Name   rewrite_tag
+    Match  proc.scrape
+    Rule   $message .*metricsextension.* procai.metricsextension.memvmrss.scrape false
+
+[OUTPUT]
+    Name                            appinsights
+    Match                           procai.*
+
+[OUTPUT]
+    Name                            appinsights
+    Match                           cpu.otel
+
+[OUTPUT]
+    Name                            appinsights
+    Match                           cpu.metricsextension
+
+[OUTPUT]
+    Name                            appinsights
+    Match                           promscrape.scrape
diff --git a/otelcollector/fluent-bit/fluent-bit-parsers.conf b/otelcollector/fluent-bit/fluent-bit-parsers.conf
index 2f4db187e..94ec2b694 100644
--- a/otelcollector/fluent-bit/fluent-bit-parsers.conf
+++ b/otelcollector/fluent-bit/fluent-bit-parsers.conf
@@ -34,3 +34,27 @@
     Time_Key time
     Time_Format %Y-%m-%dT%H:%M:%S
     Time_Keep On
+
+[PARSER]
+    Name proc-parser
+    Format regex
+    Regex ^[^\[]*\[\s*(?<time>[^\s,]+),\s*(?<message>.*)\]$
+    Time_Key time
+    Time_Format %s.%L
+    Time_Keep On
+
+[PARSER]
+    Name promscrape-parser
+    Format regex
+    Regex ^(?<time>\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d+Z)\s+(?<message>.*)$
+    Time_Key time
+    Time_Format %Y-%m-%dT%H:%M:%S.%L
+    Time_Keep On
+
+[PARSER]
+    Name cpu-parser
+    Format regex
+    Regex ^[^:]+: \[(?<time>[^\s,]+), \{"cpu_p":(?<message>[^,]+),.*
+    Time_Key time
+    Time_Format %s.%L
+    Time_Keep On
diff --git a/otelcollector/fluent-bit/fluent-bit.conf b/otelcollector/fluent-bit/fluent-bit.conf
index 1405ad756..a1f090db2 100644
--- a/otelcollector/fluent-bit/fluent-bit.conf
+++ b/otelcollector/fluent-bit/fluent-bit.conf
@@ -92,6 +92,49 @@
     Skip_Long_Lines On
     Ignore_Older 2m
 
+[INPUT]
+    Name          proc
+    Proc_Name     otelcollector
+    Interval_Sec  10
+    Tag           proc.otelcollector.memvmrss.scrape
+
+[INPUT]
+    Name          proc
+    Proc_Name     metricsextension
+    Interval_Sec  10
+    Tag           proc.metricsextension.memvmrss.scrape
+
+[INPUT]
+    name prometheus_scrape
+    host localhost
+    port 8888
+    tag          promscrape.prometheus.8888
+    scrape_interval 10s
+
+[INPUT]
+    name prometheus_scrape
+    host localhost
+    port 9090
+    tag           promscrape.prometheus.9090
+    scrape_interval 10s
+
+[INPUT]
+    name prometheus_scrape
+    host ama-metrics-operator-targets.kube-system.svc.cluster.local
+    port 80
+    tag           promscrape.prometheus.operator
+    scrape_interval 10s
+
+[INPUT]
+    Name cpu
+    Tag  cpu.otelcollector
+    PID  ${OTEL_PID}
+
+[INPUT]
+    Name cpu
+    Tag  cpu.me
+    PID  ${ME_PID}
+
 # Send log lines that contain the telemetry we want to a different tag
 # to then send to customMetrics table
 [FILTER]
@@ -163,3 +206,98 @@
     Format                          json_lines
     json_date_key                   time
     Match                           prometheus.log.noconfiguration
+
+[OUTPUT]
+    Name file
+    Match proc.*
+    Path /opt/fluent-bit
+    File proc.log
+
+[OUTPUT]
+    Name file
+    Match promscrape.*
+    Path /opt/fluent-bit
+    File promscrape.log
+
+[OUTPUT]
+    Name file
+    Match cpu.otelcollector
+    Path /opt/fluent-bit
+    File otelcpu.log
+
+[OUTPUT]
+    Name file
+    Match cpu.me
+    Path /opt/fluent-bit
+    File mecpu.log
+
+[INPUT]
+    Name tail
+    Path /opt/fluent-bit/proc.log
+    Read_from_Head true
+    Tag proc.scrape
+    Parser proc-parser
+    Mem_Buf_Limit 1m
+    Path_Key filepath
+    Skip_Long_Lines On
+    Ignore_Older 2m
+
+[INPUT]
+    Name tail
+    Path /opt/fluent-bit/promscrape.log
+    Read_from_Head true
+    Tag promscrape.scrape
+    Parser promscrape-parser
+    Mem_Buf_Limit 1m
+    Path_Key filepath
+    Skip_Long_Lines On
+    Ignore_Older 2m
+
+
+[INPUT]
+    Name tail
+    Path /opt/fluent-bit/otelcpu.log
+    Read_from_Head true
+    Tag cpu.otel
+    Parser cpu-parser
+    Mem_Buf_Limit 1m
+    Path_Key filepath
+    Skip_Long_Lines On
+    Ignore_Older 2m
+
+[INPUT]
+    Name tail
+    Path /opt/fluent-bit/mecpu.log
+    Read_from_Head true
+    Tag cpu.metricsextension
+    Parser cpu-parser
+    Mem_Buf_Limit 1m
+    Path_Key filepath
+    Skip_Long_Lines On
+    Ignore_Older 2m
+
+[FILTER]
+    Name   rewrite_tag
+    Match  proc.scrape
+    Rule   $message .*otelcollector.* procai.otelcollector.memvmrss.scrape false
+
+[FILTER]
+    Name   rewrite_tag
+    Match  proc.scrape
+    Rule   $message .*metricsextension.* procai.metricsextension.memvmrss.scrape false
+
+[OUTPUT]
+    Name                            appinsights
+    Match                           procai.*
+
+[OUTPUT]
+    Name                            appinsights
+    Match                           cpu.otel
+
+[OUTPUT]
+    Name                            appinsights
+    Match                           cpu.metricsextension
+
+[OUTPUT]
+    Name                            appinsights
+    Match                           promscrape.scrape
diff --git a/otelcollector/fluent-bit/src/appinsights.go b/otelcollector/fluent-bit/src/appinsights.go
index f2770557d..8c354cfe5 100644
--- a/otelcollector/fluent-bit/src/appinsights.go
+++ b/otelcollector/fluent-bit/src/appinsights.go
@@ -11,10 +11,10 @@ import (
 	lumberjack "gopkg.in/natefinch/lumberjack.v2"
 )
 
-//env variable which has ResourceName for NON-AKS
+// env variable which has ResourceName for NON-AKS
 const ResourceNameEnv = "ACS_RESOURCE_NAME"
 
-//env variable which has container run time name
+// env variable which has container run time name
 const ContainerRuntimeEnv = "CONTAINER_RUNTIME"
 
 var (
diff --git a/otelcollector/fluent-bit/src/go.mod b/otelcollector/fluent-bit/src/go.mod
index c3705f1be..a01cd244a 100644
--- a/otelcollector/fluent-bit/src/go.mod
+++ b/otelcollector/fluent-bit/src/go.mod
@@ -3,7 +3,7 @@ module Docker-Provider/source/plugins/go/src
 go 1.14
 
 require (
-	github.com/fluent/fluent-bit-go v0.0.0-20220311094233-780004bf5562
+	github.com/fluent/fluent-bit-go v0.0.0-20230731091245-a7a013e2473c
 	github.com/microsoft/ApplicationInsights-Go v0.4.4
 	github.com/prometheus/client_golang v1.18.0
 	github.com/rogpeppe/go-internal v1.11.0 // indirect
diff --git a/otelcollector/fluent-bit/src/go.sum b/otelcollector/fluent-bit/src/go.sum
index dedb308fe..aae63fd7c 100644
--- a/otelcollector/fluent-bit/src/go.sum
+++ b/otelcollector/fluent-bit/src/go.sum
@@ -680,8 +680,8 @@ github.com/envoyproxy/protoc-gen-validate v0.6.7/go.mod h1:dyJXwwfPK2VSqiB9Klm1J
 github.com/envoyproxy/protoc-gen-validate v0.9.1/go.mod h1:OKNgG7TCp5pF4d6XftA0++PMirau2/yoOwVac3AbF2w=
 github.com/envoyproxy/protoc-gen-validate v0.10.0/go.mod h1:DRjgyB0I43LtJapqN6NiRwroiAU2PaFuvk/vjgh61ss=
 github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
-github.com/fluent/fluent-bit-go v0.0.0-20220311094233-780004bf5562 h1:x2JSiiQ0Q7JCyQXOYnTWdYYiSAuKs/8KwEFBdtxLfKg=
-github.com/fluent/fluent-bit-go v0.0.0-20220311094233-780004bf5562/go.mod h1:L92h+dgwElEyUuShEwjbiHjseW410WIcNz+Bjutc8YQ=
+github.com/fluent/fluent-bit-go v0.0.0-20230731091245-a7a013e2473c h1:yKN46XJHYC/gvgH2UsisJ31+n4K3S7QYZSfU2uAWjuI=
+github.com/fluent/fluent-bit-go v0.0.0-20230731091245-a7a013e2473c/go.mod h1:L92h+dgwElEyUuShEwjbiHjseW410WIcNz+Bjutc8YQ=
 github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
 github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
diff --git a/otelcollector/fluent-bit/src/out_appinsights.go b/otelcollector/fluent-bit/src/out_appinsights.go
index 140d3dc72..9e10585cf 100644
--- a/otelcollector/fluent-bit/src/out_appinsights.go
+++ b/otelcollector/fluent-bit/src/out_appinsights.go
@@ -16,9 +16,10 @@ func FLBPluginRegister(ctx unsafe.Pointer) int {
 	return output.FLBPluginRegister(ctx, "appinsights", "AppInsights GO!")
 }
 
-//export FLBPluginInit
 // (fluentbit will call this)
 // ctx (context) pointer to fluentbit context (state/ c code)
+//
+//export FLBPluginInit
 func FLBPluginInit(ctx unsafe.Pointer) int {
 
 	// This will not load the plugin instance. FLBPluginFlush won't be called.
@@ -58,6 +59,8 @@ func FLBPluginFlush(data unsafe.Pointer, length C.int, tag *C.char) int {
 	var record map[interface{}]interface{}
 	var records []map[interface{}]interface{}
 
+	incomingTag := strings.ToLower(C.GoString(tag))
+	Log("Print the incoming tag: %s", incomingTag)
 	// Create Fluent Bit decoder
 	dec := output.NewDecoder(data, int(length))
 
@@ -71,8 +74,6 @@ func FLBPluginFlush(data unsafe.Pointer, length C.int, tag *C.char) int {
 		records = append(records, record)
 	}
 
-	incomingTag := strings.ToLower(C.GoString(tag))
-
 	// Metrics Extension logs with metrics received, dropped, and processed counts
 	switch incomingTag {
 	case fluentbitEventsProcessedLastPeriodTag:
@@ -85,6 +86,16 @@ func FLBPluginFlush(data unsafe.Pointer, length C.int, tag *C.char) int {
 		return PushInfiniteMetricLogToAppInsightsEvents(records)
 	case fluentbitExportingFailedTag:
 		return RecordExportingFailed(records)
+	case otelcolCpuScrapeTag:
+		return PushOtelCpuToAppInsightsMetrics(records)
+	case otelcolMemRssScrapeTag:
+		return PushOtelColMemRssToAppInsightsMetrics(records)
+	case meMemRssScrapeTag:
+		return PushMEMemRssToAppInsightsMetrics(records)
+	case promScrapeTag:
+		return PushPromToAppInsightsMetrics(records)
+	case meCpuScrapeTag:
+		return PushMECpuToAppInsightsMetrics(records)
 	default:
 		// Error messages from metrics extension and otelcollector
 		return PushLogErrorsToAppInsightsTraces(records, appinsights.Information, incomingTag)
diff --git a/otelcollector/fluent-bit/src/telemetry.go b/otelcollector/fluent-bit/src/telemetry.go
index 329dba362..b65265001 100644
--- a/otelcollector/fluent-bit/src/telemetry.go
+++ b/otelcollector/fluent-bit/src/telemetry.go
@@ -9,9 +9,11 @@ import (
 	"errors"
 	"fmt"
 	"io/ioutil"
+	"math"
 	"net/http"
 	"os"
 	"regexp"
+	"sort"
 	"strconv"
 	"strings"
 	"sync"
@@ -106,6 +108,7 @@ const (
 	coresAttachedTelemetryIntervalSeconds = 600
 	ksmAttachedTelemetryIntervalSeconds   = 600
 	meMetricsTelemetryIntervalSeconds     = 300
+	meOtelCpuMemoryUsageIntervalSeconds   = 300
 	coresAttachedTelemetryName            = "ClusterCoreCapacity"
 	linuxCpuCapacityTelemetryName         = "LiCapacity"
 	linuxNodeCountTelemetryName           = "LiNodeCnt"
@@ -131,6 +134,8 @@ const (
 	envComputerName                       = "NODE_NAME"
 	envDefaultMetricAccountName           = "AZMON_DEFAULT_METRIC_ACCOUNT_NAME"
 	envPodName                            = "POD_NAME"
+	envContainerCpuLimit                  = "CONTAINER_CPU_LIMIT"
+	envContainerMemoryLimit               = "CONTAINER_MEMORY_LIMIT"
 	envTelemetryOffSwitch                 = "DISABLE_TELEMETRY"
 	envNamespace                          = "POD_NAMESPACE"
 	envHelmReleaseName                    = "HELM_RELEASE_NAME"
@@ -142,6 +147,11 @@ const (
 	fluentbitInfiniteMetricTag            = "prometheus.log.infinitemetric"
 	fluentbitContainerLogsTag             = "prometheus.log.prometheuscollectorcontainer"
 	fluentbitExportingFailedTag           = "prometheus.log.exportingfailed"
+	meMemRssScrapeTag                     = "procai.metricsextension.memvmrss.scrape"
+	otelcolMemRssScrapeTag                = "procai.otelcollector.memvmrss.scrape"
+	otelcolCpuScrapeTag                   = "cpu.otel"
+	meCpuScrapeTag                        = "cpu.metricsextension"
+	promScrapeTag                         = "promscrape.scrape"
 	fluentbitFailedScrapeTag              = "prometheus.log.failedscrape"
 	keepListRegexHashFilePath             = "/opt/microsoft/configmapparser/config_def_targets_metrics_keep_list_hash"
 	intervalHashFilePath                  = "/opt/microsoft/configmapparser/config_def_targets_scrape_intervals_hash"
@@ -196,6 +206,42 @@ func InitializeTelemetryClient(agentVersion string) (int, error) {
 	CommonProperties["podname"] = os.Getenv(envPodName)
 	CommonProperties["helmreleasename"] = os.Getenv(envHelmReleaseName)
 	CommonProperties["osType"] = os.Getenv("OS_TYPE")
+	CommonProperties["containercpulimit"] = os.Getenv(envContainerCpuLimit)
+	CommonProperties["containermemorylimit"] = os.Getenv(envContainerMemoryLimit)
+	CommonProperties["defaultscrapekubelet"] = os.Getenv("AZMON_PROMETHEUS_KUBELET_SCRAPING_ENABLED")
+	CommonProperties["defaultscrapecoreDns"] = os.Getenv("AZMON_PROMETHEUS_COREDNS_SCRAPING_ENABLED")
+	CommonProperties["defaultscrapecadvisor"] = os.Getenv("AZMON_PROMETHEUS_CADVISOR_SCRAPING_ENABLED")
+	CommonProperties["defaultscrapekubeproxy"] = os.Getenv("AZMON_PROMETHEUS_KUBEPROXY_SCRAPING_ENABLED")
+	CommonProperties["defaultscrapeapiserver"] = os.Getenv("AZMON_PROMETHEUS_APISERVER_SCRAPING_ENABLED")
+	CommonProperties["defaultscrapekubestate"] = os.Getenv("AZMON_PROMETHEUS_KUBESTATE_SCRAPING_ENABLED")
+	CommonProperties["defaultscrapenodeexporter"] = os.Getenv("AZMON_PROMETHEUS_NODEEXPORTER_SCRAPING_ENABLED")
+	CommonProperties["defaultscrapecollectorhealth"] = os.Getenv("AZMON_PROMETHEUS_COLLECTOR_HEALTH_SCRAPING_ENABLED")
+	CommonProperties["defaultscrapewindowsexporter"] = os.Getenv("AZMON_PROMETHEUS_WINDOWSEXPORTER_SCRAPING_ENABLED")
+	CommonProperties["defaultscrapewindowskubeproxy"] = os.Getenv("AZMON_PROMETHEUS_WINDOWSKUBEPROXY_SCRAPING_ENABLED")
+	CommonProperties["defaultscrapepodannotations"] = os.Getenv("AZMON_PROMETHEUS_POD_ANNOTATION_SCRAPING_ENABLED")
+	CommonProperties["podannotationns"] = os.Getenv("AZMON_PROMETHEUS_POD_ANNOTATION_NAMESPACES_REGEX")
+	CommonProperties["defaultscrapekappiebasic"] = os.Getenv("AZMON_PROMETHEUS_KAPPIEBASIC_SCRAPING_ENABLED")
+	CommonProperties["defaultscrapenetworkobservabilityRetina"] = os.Getenv("AZMON_PROMETHEUS_NETWORKOBSERVABILITYRETINA_SCRAPING_ENABLED")
+	CommonProperties["defaultscrapenetworkobservabilityHubble"] = os.Getenv("AZMON_PROMETHEUS_NETWORKOBSERVABILITYHUBBLE_SCRAPING_ENABLED")
+	CommonProperties["defaultscrapenetworkobservabilityCilium"] = os.Getenv("AZMON_PROMETHEUS_NETWORKOBSERVABILITYCILIUM_SCRAPING_ENABLED")
+	CommonProperties["nodeexportertargetport"] = os.Getenv("NODE_EXPORTER_TARGETPORT")
+	CommonProperties["nodeexportername"] = os.Getenv("NODE_EXPORTER_NAME")
+	CommonProperties["kubestatename"] = os.Getenv("KUBE_STATE_NAME")
+	CommonProperties["kubestateversion"] = os.Getenv("KUBE_STATE_VERSION")
+	CommonProperties["nodeexporterversion"] = os.Getenv("NODE_EXPORTER_VERSION")
+	CommonProperties["akvauth"] = os.Getenv("AKVAUTH")
+	CommonProperties["debugmodeenabled"] = os.Getenv("DEBUG_MODE_ENABLED")
+	CommonProperties["kubestatemetriclabelsallowlist"] = os.Getenv("KUBE_STATE_METRIC_LABELS_ALLOWLIST")
+	CommonProperties["kubestatemetricannotationsallowlist"] = os.Getenv("KUBE_STATE_METRIC_ANNOTATIONS_ALLOWLIST")
+	CommonProperties["httpproxyenabled"] = os.Getenv("HTTP_PROXY_ENABLED")
+	CommonProperties["tadapterh"] = os.Getenv("tokenadapterHealthyAfterSecs")
+	CommonProperties["tadapterf"] = os.Getenv("tokenadapterUnhealthyAfterSecs")
+	CommonProperties["mip"] = os.Getenv("MINIMAL_INGESTION_PROFILE")
+	CommonProperties["operatormodel"] = os.Getenv("AZMON_OPERATOR_ENABLED")
+	CommonProperties["operatormodelcfgmapsetting"] = os.Getenv("AZMON_OPERATOR_ENABLED_CFG_MAP_SETTING")
+	CommonProperties["operatormodelchartsetting"] = os.Getenv("AZMON_OPERATOR_ENABLED_CHART_SETTING")
+	CommonProperties["operatortargetstaimgversion"] = os.Getenv("OPERATOR_TARGETS_TA_IMG_VERSION")
+	CommonProperties["operatortargetscfgreaderimgversion"] = os.Getenv("OPERATOR_TARGETS_CFG_READER_IMG_VERSION")
 
 	isMacMode := os.Getenv("MAC")
 	if strings.Compare(strings.ToLower(isMacMode), "true") == 0 {
@@ -840,3 +886,275 @@ func RecordExportingFailed(records []map[interface{}]interface{}) int {
 	}
 	return output.FLB_OK
 }
+
+func PushPromToAppInsightsMetrics(records []map[interface{}]interface{}) int {
+	// Define a regular expression to extract the metric name, metric value and other details
+	var logRegex = regexp.MustCompile(`^(?P<metricName>otelcol_processor_dropped_metric_points|otelcol_receiver_refused_metric_points|otelcol_receiver_accepted_metric_points|otelcol_exporter_sent_metric_points|otelcol_exporter_queue_size|otelcol_exporter_send_failed_metric_points|otelcol_process_memory_rss|otelcol_processor_batch_batch_send_size_bytes_sum|otelcol_processor_batch_batch_send_size_bytes_count|prometheus_sd_http_failures_total|opentelemetry_allocator_targets|opentelemetry_allocator_collectors_discovered)(\{[^}]*\})?\s+=\s+(?P<metricValue>\d+)$`)
+
+	for _, record := range records {
+		var logEntry = ToString(record["message"])
+		Log(logEntry)
+
+		groupMatches := logRegex.FindStringSubmatch(logEntry)
+
+		if len(groupMatches) < 3 {
+			message := fmt.Sprintf("Failed to parse log record: %s", logEntry)
+			Log(message)
+			continue
+		}
+
+		// Extract the metric value and convert to float
+		metricValue, err := strconv.ParseFloat(groupMatches[3], 64)
+		if err != nil {
+			message := fmt.Sprintf("Failed to convert metric value to float64: %v", err)
+			Log(message)
+			continue
+		}
+		var jobName string
+		if groupMatches[1] == "opentelemetry_allocator_targets" {
+			var jobRegex = regexp.MustCompile(`job_name="([^"]+)"`)
+			jobMatches := jobRegex.FindStringSubmatch(groupMatches[2])
+			if len(jobMatches) > 1 {
+				jobName = jobMatches[1]
+				message := fmt.Sprintf("Job name found: %s", jobName)
+				Log(message)
+			} else {
+				message := fmt.Sprintf("Job name not found in %s", groupMatches[2])
+				Log(message)
+				continue
+			}
+		}
+
+		// Create and send metric
+		var metricName string
+		if groupMatches[1] == "opentelemetry_allocator_targets" || groupMatches[1] == "opentelemetry_allocator_collectors_discovered" {
+			metricName = "target_allocator_" + groupMatches[1]
+		} else {
+			metricName = "prometheus_" + groupMatches[1]
+		}
+		metric := appinsights.NewMetricTelemetry(metricName, metricValue)
+		metric.Properties["job_name"] = fmt.Sprintf("%s", jobName)
+		TelemetryClient.Track(metric)
+		Log(fmt.Sprintf("Sent %s metrics", metricName))
+	}
+	return output.FLB_OK
+}
+
+func PushOtelCpuToAppInsightsMetrics(records []map[interface{}]interface{}) int {
+	var totalCpuUsage float64
+	var count int
+	var cpuUsages []float64
+
+	duration := time.Duration(meOtelCpuMemoryUsageIntervalSeconds) * time.Second
+	deadline := time.Now().Add(duration)
+
+	ticker := time.NewTicker(time.Second)
+	defer ticker.Stop() // This will stop the ticker when the function returns
+
+	for ; time.Now().Before(deadline); <-ticker.C {
+		for _, record := range records {
+			var logEntry = ToString(record["message"])
+			Log(logEntry)
+
+			otelcpuUsage, err := strconv.ParseFloat(logEntry, 64)
+			if err != nil {
+				message := fmt.Sprintf("Failed to parse otelcpuUsage as float64: %v", err)
+				Log(message)
+				SendException(message)
+				continue
+			}
+
+			totalCpuUsage += otelcpuUsage
+			count++
+			cpuUsages = append(cpuUsages, otelcpuUsage)
+		}
+
+		if count > 0 {
+			averageCpuUsage := totalCpuUsage / float64(count)
+			metric := appinsights.NewMetricTelemetry("otelcollector_cpu_usage_050", averageCpuUsage)
+			TelemetryClient.Track(metric)
+			Log("Sent Otel Cpu usage metrics")
+
+			sort.Float64s(cpuUsages)
+			index := int(math.Ceil(0.95 * float64(len(cpuUsages))))
+			percentile95 := cpuUsages[index-1]
+			metric95 := appinsights.NewMetricTelemetry("otelcollector_cpu_usage_095", percentile95)
+			TelemetryClient.Track(metric95)
+			Log("Sent Otel 95th percentile  Cpu usage metrics")
+
+			totalCpuUsage = 0
+			count = 0
+			cpuUsages = []float64{}
+		}
+	}
+
+	return output.FLB_OK
+}
+
+func PushMECpuToAppInsightsMetrics(records []map[interface{}]interface{}) int {
+	var totalCpuUsage float64
+	var count int
+	var cpuUsages []float64
+
+	duration := time.Duration(meOtelCpuMemoryUsageIntervalSeconds) * time.Second
+	deadline := time.Now().Add(duration)
+
+	ticker := time.NewTicker(time.Second)
+	defer ticker.Stop() // This will stop the ticker when the function returns
+
+	for ; time.Now().Before(deadline); <-ticker.C {
+		for _, record := range records {
+			var logEntry = ToString(record["message"])
+			Log(logEntry)
+
+			meCpuUsage, err := strconv.ParseFloat(logEntry, 64)
+			if err != nil {
+				message := fmt.Sprintf("Failed to parse meCpuUsage as float64: %v", err)
+				Log(message)
+				SendException(message)
+				continue
+			}
+
+			totalCpuUsage += meCpuUsage
+			count++
+			cpuUsages = append(cpuUsages, meCpuUsage)
+		}
+
+		if count > 0 {
+			averageCpuUsage := totalCpuUsage / float64(count)
+			metric := appinsights.NewMetricTelemetry("metricsextension_cpu_usage_050", averageCpuUsage)
+			TelemetryClient.Track(metric)
+			Log("Sent ME Average Cpu usage metrics")
+
+			sort.Float64s(cpuUsages)
+			index := int(math.Ceil(0.95 * float64(len(cpuUsages))))
+			percentile95 := cpuUsages[index-1]
+			metric95 := appinsights.NewMetricTelemetry("metricsextension_cpu_usage_095", percentile95)
+			TelemetryClient.Track(metric95)
+			Log("Sent ME 95th percentile  Cpu usage metrics")
+
+			totalCpuUsage = 0
+			count = 0
+			cpuUsages = []float64{}
+		}
+	}
+
+	return output.FLB_OK
+}
+
+func PushMEMemRssToAppInsightsMetrics(records []map[interface{}]interface{}) int {
+	var totalMemUsage float64
+	var count int
+	var memUsages []float64
+
+	duration := time.Duration(meOtelCpuMemoryUsageIntervalSeconds) * time.Second
+	deadline := time.Now().Add(duration)
+
+	ticker := time.NewTicker(time.Second)
+	defer ticker.Stop()
+
+	for ; time.Now().Before(deadline); <-ticker.C {
+		for _, record := range records {
+			var logEntry = ToString(record["message"])
+			Log(logEntry)
+
+			// Define a regular expression to extract mem.VmRSS value
+			var memVmrssRegex = regexp.MustCompile(`"mem\.VmRSS":(\d+)`)
+			groupMatches := memVmrssRegex.FindStringSubmatch(logEntry)
+			if len(groupMatches) > 1 {
+				// Convert mem.VmRSS value to float64
+				memVmrssFloat, err := strconv.ParseFloat(groupMatches[1], 64)
+				if err != nil {
+					message := fmt.Sprintf("Failed to convert mem.VmRSS to float64: %v", err)
+					Log(message)
+					SendException(message)
+					continue
+				}
+
+				totalMemUsage += memVmrssFloat
+				count++
+				memUsages = append(memUsages, memVmrssFloat)
+			}
+		}
+
+		if count > 0 {
+			averageMemUsage := totalMemUsage / float64(count)
+			metric := appinsights.NewMetricTelemetry("metricsextension_memory_rss_050", averageMemUsage)
+			TelemetryClient.Track(metric)
+			Log("Sent ME average memory usage metrics")
+
+			// Calculate 95th percentile
+			sort.Float64s(memUsages)
+			index := int(math.Ceil(0.95 * float64(len(memUsages))))
+			percentile95 := memUsages[index-1]
+			metric95 := appinsights.NewMetricTelemetry("metricsextension_memory_rss_095", percentile95)
+			TelemetryClient.Track(metric95)
+			Log("Sent ME 95th percentile memory usage metrics")
+
+			totalMemUsage = 0
+			count = 0
+			memUsages = []float64{}
+		}
+	}
+
+	return output.FLB_OK
+}
+
+func PushOtelColMemRssToAppInsightsMetrics(records []map[interface{}]interface{}) int {
+	var totalMemUsage float64
+	var count int
+	var memUsages []float64
+
+	duration := time.Duration(meOtelCpuMemoryUsageIntervalSeconds) * time.Second
+	deadline := time.Now().Add(duration)
+
+	ticker := time.NewTicker(time.Second)
+	defer ticker.Stop() // This will stop the ticker when the function returns
+
+	for ; time.Now().Before(deadline); <-ticker.C {
+		for _, record := range records {
+			var logEntry = ToString(record["message"])
+			Log(logEntry)
+
+			// Define a regular expression to extract mem.VmRSS value
+			var memVmrssRegex = regexp.MustCompile(`"mem\.VmRSS":(\d+)`)
+			groupMatches := memVmrssRegex.FindStringSubmatch(logEntry)
+
+			if len(groupMatches) > 1 {
+				// Convert mem.VmRSS value to float64
+				memVmrssFloat, err := strconv.ParseFloat(groupMatches[1], 64)
+				if err != nil {
+					message := fmt.Sprintf("Failed to convert mem.VmRSS to float64: %v", err)
+					Log(message)
+					SendException(message)
+					continue
+				}
+
+				totalMemUsage += memVmrssFloat
+				count++
+				memUsages = append(memUsages, memVmrssFloat)
+			}
+		}
+
+		if count > 0 {
+			averageMemUsage := totalMemUsage / float64(count)
+			metric := appinsights.NewMetricTelemetry("otelcollector_memory_rss_050", averageMemUsage)
+			TelemetryClient.Track(metric)
+			Log("Sent Otel average memory usage metrics")
+
+			// Calculate 95th percentile
+			sort.Float64s(memUsages)
+			index := int(math.Ceil(0.95 * float64(len(memUsages))))
+			percentile95 := memUsages[index-1]
+			metric95 := appinsights.NewMetricTelemetry("otelcollector_memory_rss_095", percentile95)
+			TelemetryClient.Track(metric95)
+			Log("Sent Otel 95th percentile memory usage metrics")
+
+			totalMemUsage = 0
+			count = 0
+			memUsages = []float64{}
+		}
+	}
+
+	return output.FLB_OK
+}
diff --git a/otelcollector/scripts/main.sh b/otelcollector/scripts/main.sh
index 8af2a639d..d3013e5f2 100644
--- a/otelcollector/scripts/main.sh
+++ b/otelcollector/scripts/main.sh
@@ -20,7 +20,7 @@ echo_var "CLUSTER" "$CLUSTER"
 customEnvironment_lower=$(echo "$customEnvironment" | tr '[:upper:]' '[:lower:]')
 if [ "$customEnvironment_lower" == "azurepubliccloud" ]; then
   encodedaikey="$APPLICATIONINSIGHTS_AUTH_PUBLIC"
-  echo "setting telemetry output to the default azurepubliccloud instance" 
+  echo "setting telemetry output to the default azurepubliccloud instance"
 elif [ "$customEnvironment_lower" == "azureusgovernmentcloud" ]; then
   encodedaikey="$APPLICATIONINSIGHTS_AUTH_USGOVERNMENT"
   aiendpoint="https://dc.applicationinsights.us/v2/track"
@@ -52,11 +52,6 @@ if [ -n "$aiendpoint" ]; then
     export APPLICATIONINSIGHTS_ENDPOINT="$aiendpoint"
     echo "export APPLICATIONINSIGHTS_ENDPOINT=\"$aiendpoint\"" >> ~/.bashrc
 fi
-# Delete this when telegraf is removed
-aikey=$(echo $APPLICATIONINSIGHTS_AUTH | base64 -d)
-export TELEMETRY_APPLICATIONINSIGHTS_KEY=$aikey
-echo "export TELEMETRY_APPLICATIONINSIGHTS_KEY=$aikey" >> ~/.bashrc
-source ~/.bashrc
 
 #get controller kind in lowercase, trimmed
 controllerType=$(echo $CONTROLLER_TYPE | tr "[:upper:]" "[:lower:]" | xargs)
@@ -255,7 +250,7 @@ else
       # Use options -T 0x1 or -T 0xFFFF for debug logging
       mdsd -a -A -e ${MDSD_LOG}/mdsd.err -w ${MDSD_LOG}/mdsd.warn -o ${MDSD_LOG}/mdsd.info -q ${MDSD_LOG}/mdsd.qos 2>> /dev/null &
 
-      # Running mdsd --version can't be captured into a variable unlike telegraf and otelcollector, have to run after printing the string
+      # Running mdsd --version can't be captured into a variable unlike otelcollector, have to run after printing the string
       echo -n -e "${Cyan}MDSD_VERSION${Color_Off}="; mdsd --version
 
       echo "Waiting for 30s for MDSD to get the config and put them in place for ME"
@@ -267,7 +262,9 @@ else
       echo "Starting metricsextension"
       /usr/sbin/MetricsExtension -Logger File -LogLevel Info -LocalControlChannel -TokenSource AMCS -DataDirectory /etc/mdsd.d/config-cache/metricsextension -Input otlp_grpc_prom -ConfigOverrides $meConfigString > /dev/null &
 fi
-
+ME_PID=$!
+echo_var "ME_PID" "$ME_PID"
+sed -i "s/\${ME_PID}/$ME_PID/" $fluentBitConfigFile
 # Get ME version
 ME_VERSION=`cat /opt/metricsextversion.txt`
 echo_var "ME_VERSION" "$ME_VERSION"
@@ -292,32 +289,26 @@ else
       echo "Starting otelcollector"
       /opt/microsoft/otelcollector/otelcollector --config /opt/microsoft/otelcollector/collector-config.yml &> /opt/microsoft/otelcollector/collector-log.txt &
 fi
+OTEL_PID=$!
+echo_var "OTEL_PID" "$OTEL_PID"
+sed -i "s/\${OTEL_PID}/$OTEL_PID/" $fluentBitConfigFile
 OTELCOLLECTOR_VERSION=`/opt/microsoft/otelcollector/otelcollector --version`
 echo_var "OTELCOLLECTOR_VERSION" "$OTELCOLLECTOR_VERSION"
 PROMETHEUS_VERSION=`cat /opt/microsoft/otelcollector/PROMETHEUS_VERSION`
 echo_var "PROMETHEUS_VERSION" "$PROMETHEUS_VERSION"
 
-echo "starting telegraf"
-if [ "$TELEMETRY_DISABLED" != "true" ]; then
-  if [ "$CONTROLLER_TYPE" == "ReplicaSet" ]  && [ "${AZMON_OPERATOR_ENABLED}" == "true" ]; then
-    /usr/bin/telegraf --config /opt/telegraf/telegraf-prometheus-collector-ta-enabled.conf &
-  elif [ "$CONTROLLER_TYPE" == "ReplicaSet" ]; then
-    /usr/bin/telegraf --config /opt/telegraf/telegraf-prometheus-collector.conf &
-  else
-    /usr/bin/telegraf --config /opt/telegraf/telegraf-prometheus-collector-ds.conf &
-  fi
-  TELEGRAF_VERSION=`cat /opt/telegrafversion.txt`
-  echo_var "TELEGRAF_VERSION" "$TELEGRAF_VERSION"
-fi
-
 echo "starting fluent-bit"
 mkdir /opt/microsoft/fluent-bit
 touch /opt/microsoft/fluent-bit/fluent-bit-out-appinsights-runtime.log
+
+
 fluent-bit -c $FLUENT_BIT_CONFIG_FILE -e /opt/fluent-bit/bin/out_appinsights.so &
+
 FLUENT_BIT_VERSION=`fluent-bit --version`
 echo_var "FLUENT_BIT_VERSION" "$FLUENT_BIT_VERSION"
 echo_var "FLUENT_BIT_CONFIG_FILE" "$FLUENT_BIT_CONFIG_FILE"
 
+
 if [ "${MAC}" == "true" ]; then
   # Run inotify as a daemon to track changes to the dcr/dce config folder and restart container on changes, so that ME can pick them up.
   echo "starting inotify for watching mdsd config update"
diff --git a/otelcollector/scripts/setup.sh b/otelcollector/scripts/setup.sh
index f44781399..8b89856bd 100644
--- a/otelcollector/scripts/setup.sh
+++ b/otelcollector/scripts/setup.sh
@@ -50,11 +50,6 @@ cp -f $TMPDIR/envmdsd /etc/mdsd.d
 # Create the following directory for mdsd logs
 mkdir /opt/microsoft/linuxmonagent
 
-# Install telegraf
-echo "Installing telegraf..."
-sudo tdnf install telegraf-1.28.5 -y
-sudo tdnf list installed | grep telegraf | awk '{print $2}' > telegrafversion.txt
-
 # Install fluent-bit
 echo "Installing fluent-bit..."
 sudo tdnf install fluent-bit-2.1.10 -y
@@ -73,5 +68,3 @@ sudo tdnf list installed | grep metricsext2 | awk '{print $2}' > metricsextversi
 # Remove any RPMs downloaded not from Mariner
 rm -f $TMPDIR/metricsext2*.rpm
 rm -f $TMPDIR/azure-mdsd*.rpm
-# Remove mdsd's telegraf
-rm /usr/sbin/telegraf
\ No newline at end of file
diff --git a/otelcollector/telegraf/telegraf-prometheus-collector-ds.conf b/otelcollector/telegraf/telegraf-prometheus-collector-ds.conf
deleted file mode 100644
index 260dfab05..000000000
--- a/otelcollector/telegraf/telegraf-prometheus-collector-ds.conf
+++ /dev/null
@@ -1,192 +0,0 @@
-# Telegraf Configuration
-#
-# Telegraf is entirely plugin driven. All metrics are gathered from the
-# declared inputs, and sent to the declared outputs.
-#
-# Plugins must be declared in here to be active.
-# To deactivate a plugin, comment out the name and any variables.
-#
-# Use 'telegraf -config telegraf.conf -test' to see what metrics a config
-# file would generate.
-#
-# Environment variables can be used anywhere in this config file, simply prepend
-# them with $. For strings the variable must be within quotes (ie, "$STR_VAR"),
-# for numbers and booleans they should be plain (ie, $INT_VAR, $BOOL_VAR)
-
-
-# Global tags can be specified here in key="value" format.
-[global_tags]
-  #Below are entirely used for telemetry
-  agentversion = "$AGENT_VERSION"
-  cluster = "$customResourceId"
-  calias = "$AZMON_CLUSTER_ALIAS"
-  clabel = "$AZMON_CLUSTER_LABEL"
-  Region = "$AKSREGION"
-  computer = "$NODE_NAME"
-  nodeip = "$NODE_IP"
-  mode = "$MODE"
-  winmode = "$WINMODE"
-  macmode = "$MAC"
-  controllertype = "$CONTROLLER_TYPE"
-  defaultmetricaccountname = "$AZMON_DEFAULT_METRIC_ACCOUNT_NAME"
-  namespace = "$POD_NAMESPACE"
-  podname = "$POD_NAME"
-  ostype = "$OS_TYPE"
-  mip="$MINIMAL_INGESTION_PROFILE"
-
-# Configuration for telegraf agent
-[agent]
-  ## Default data collection interval for all inputs
-  interval = "60s"
-  ## Rounds collection interval to 'interval'
-  ## ie, if interval="10s" then always collect on :00, :10, :20, etc.
-  round_interval = false
-
-  ## Telegraf will send metrics to outputs in batches of at most
-  ## metric_batch_size metrics.
-  ## This controls the size of writes that Telegraf sends to output plugins.
-  metric_batch_size = 1000
-
-  ## For failed writes, telegraf will cache metric_buffer_limit metrics for each
-  ## output, and will flush this buffer on a successful write. Oldest metrics
-  ## are dropped first when this buffer fills.
-  ## This buffer only fills when writes fail to output plugin(s).
-  metric_buffer_limit = 10000
-
-  ## Collection jitter is used to jitter the collection by a random amount.
-  ## Each plugin will sleep for a random time within jitter before collecting.
-  ## This can be used to avoid many plugins querying things like sysfs at the
-  ## same time, which can have a measurable effect on the system.
-  collection_jitter = "30s"
-
-  ## Default flushing interval for all outputs. You shouldn't set this below
-  ## interval. Maximum flush_interval will be flush_interval + flush_jitter
-  flush_interval = "15s"
-  ## Jitter the flush interval by a random amount. This is primarily to avoid
-  ## large write spikes for users running a large number of telegraf instances.
-  ## ie, a jitter of 5s and interval 10s means flushes will happen every 10-15s
-  flush_jitter = "15s"
-
-  ## By default or when set to "0s", precision will be set to the same
-  ## timestamp order as the collection interval, with the maximum being 1s.
-  ##   ie, when interval = "10s", precision will be "1s"
-  ##       when interval = "250ms", precision will be "1ms"
-  ## Precision will NOT be used for service inputs. It is up to each individual
-  ## service input to set the timestamp at the appropriate precision.
-  ## Valid time units are "ns", "us" (or "µs"), "ms", "s".
-  precision = ""
-
-  ## Logging configuration:
-  ## Run telegraf with debug log messages.
-  debug = false
-  ## Run telegraf in quiet mode (error log messages only).
-  quiet = true
-  ## Specify the log file name. The empty string means to log to stderr.
-  logfile = ""
-
-  ## Override default hostname, if empty use os.Hostname()
-  #hostname = "placeholder_hostname"
-  ## If set to true, do no set the "host" tag in the telegraf agent.
-  omit_hostname = true
-
-
-###############################################################################
-#                            OUTPUT PLUGINS                                   #
-###############################################################################
-
-[[outputs.application_insights]]
-  ## Instrumentation key of the Application Insights resource.
-  instrumentation_key = "$TELEMETRY_APPLICATIONINSIGHTS_KEY"
-
-  ## Timeout for closing (default: 5s).
-  # timeout = "5s"
-
-  ## Enable additional diagnostic logging.
-  # enable_diagnostic_logging = false
-
-###############################################################################
-#                            PROCESSOR PLUGINS                                #
-###############################################################################
-[[processors.converter]]
-  [processors.converter.fields]
-    float = ["*"]
-
-###############################################################################
-#                            AGGREGATOR PLUGINS                               #
-###############################################################################
-[[aggregators.quantile]]
-  period = "5m"
-  drop_original = true
-  quantiles = [0.50,0.95]
-  algorithm = "t-digest"
-  compression = 100.0
-  namepass = ["otelcollector", "metricsextension"]
-
-# Keep the aggregate basicstats of each metric passing through.
-[[aggregators.basicstats]]
-  namepass = ["opentelemetry_allocator_targets"]
-
-  ## The period on which to flush & clear the aggregator.
-  period = "5m"
-
-  ## If true, the original metric will be dropped by the
-  ## aggregator and will not get sent to the output plugins.
-  drop_original = true
-
-  ## Configures which basic stats to push as fields
-  stats = ["count"]
- 
-###############################################################################
-#                            INPUT PLUGINS                                    #
-###############################################################################
-
-# Read metrics about cpu usage
-#[[inputs.cpu]]
-  ## Whether to report per-cpu stats or not
-#  percpu = false
-  ## Whether to report total system cpu stats or not
-#  totalcpu = true
-  ## If true, collect raw CPU time metrics.
-#  collect_cpu_time = false
-  ## If true, compute and report the sum of all non-idle CPU states.
-#  report_active = true
-#  fieldpass = ["usage_active","cluster","node","host","device"]
-#  taginclude = ["cluster","cpu","node"]
-  
-# Read metrics about memory usage
-#[[inputs.mem]]
-#  fieldpass = ["used_percent", "cluster", "node","host","device"]
-#  taginclude = ["cluster","node"]
-
-[[inputs.procstat]]
-   exe = "otelcollector"
-   interval = "10s"
-   pid_finder = "pgrep"
-   pid_tag = true
-   name_override = "otelcollector"
-   fieldpass = ["cpu_usage", "memory_rss"]
-   [inputs.procstat.tags]
-#    Computer = "$NODE_NAME"
-#    NodeIp = "$NODE_IP"
-    cpulimit = "$CONTAINER_CPU_LIMIT"
-    memlimit = "$CONTAINER_MEMORY_LIMIT" 
-    debugmodeenabled = "$DEBUG_MODE_ENABLED"
-    tadapterh="$tokenadapterHealthyAfterSecs"
-    tadapterf="$tokenadapterUnhealthyAfterSecs"
-  
-[[inputs.procstat]]
-   exe = "MetricsExtension"
-   interval = "10s"
-   pid_finder = "pgrep"
-   pid_tag = true
-   name_override = "metricsextension"
-   fieldpass = ["cpu_usage", "memory_rss"]
-   
-[[inputs.prometheus]]
-  interval = "5m"
-  urls = ["http://localhost:8888/metrics"]
-  fieldpass = ["otelcol_processor_dropped_metric_points", "otelcol_receiver_refused_metric_points", "otelcol_receiver_accepted_metric_points", "otelcol_exporter_sent_metric_points", "otelcol_exporter_queue_size", "otelcol_exporter_send_failed_metric_points", "otelcol_process_memory_rss", "otelcol_processor_batch_batch_send_size_bytes_sum", "otelcol_processor_batch_batch_send_size_bytes_count"]
-  tagexclude = ["service_instance_id"]
-  metric_version = 2
-  url_tag = "scrapeUrl"
-  timeout = "15s"
diff --git a/otelcollector/telegraf/telegraf-prometheus-collector-ta-enabled.conf b/otelcollector/telegraf/telegraf-prometheus-collector-ta-enabled.conf
deleted file mode 100644
index 2d1ea8923..000000000
--- a/otelcollector/telegraf/telegraf-prometheus-collector-ta-enabled.conf
+++ /dev/null
@@ -1,246 +0,0 @@
-# Telegraf Configuration
-#
-# Telegraf is entirely plugin driven. All metrics are gathered from the
-# declared inputs, and sent to the declared outputs.
-#
-# Plugins must be declared in here to be active.
-# To deactivate a plugin, comment out the name and any variables.
-#
-# Use 'telegraf -config telegraf.conf -test' to see what metrics a config
-# file would generate.
-#
-# Environment variables can be used anywhere in this config file, simply prepend
-# them with $. For strings the variable must be within quotes (ie, "$STR_VAR"),
-# for numbers and booleans they should be plain (ie, $INT_VAR, $BOOL_VAR)
-
-
-# Global tags can be specified here in key="value" format.
-[global_tags]
-  #Below are entirely used for telemetry
-  agentversion = "$AGENT_VERSION"
-  cluster = "$customResourceId"
-  calias = "$AZMON_CLUSTER_ALIAS"
-  clabel = "$AZMON_CLUSTER_LABEL"
-  Region = "$AKSREGION"
-  computer = "$NODE_NAME"
-  nodeip = "$NODE_IP"
-  mode = "$MODE"
-  winmode = "$WINMODE"
-  macmode = "$MAC"
-  controllertype = "$CONTROLLER_TYPE"
-  defaultmetricaccountname = "$AZMON_DEFAULT_METRIC_ACCOUNT_NAME"
-  namespace = "$POD_NAMESPACE"
-  podname = "$POD_NAME"
-  ostype = "$OS_TYPE"
-  mip = "$MINIMAL_INGESTION_PROFILE"
-  operatormodel = "$AZMON_OPERATOR_ENABLED"
-  operatormodelcfgmapsetting = "$AZMON_OPERATOR_ENABLED_CFG_MAP_SETTING"
-  operatormodelchartsetting = "$AZMON_OPERATOR_ENABLED_CHART_SETTING"
-
-# Configuration for telegraf agent
-[agent]
-  ## Default data collection interval for all inputs
-  interval = "60s"
-  ## Rounds collection interval to 'interval'
-  ## ie, if interval="10s" then always collect on :00, :10, :20, etc.
-  round_interval = false
-
-  ## Telegraf will send metrics to outputs in batches of at most
-  ## metric_batch_size metrics.
-  ## This controls the size of writes that Telegraf sends to output plugins.
-  metric_batch_size = 1000
-
-  ## For failed writes, telegraf will cache metric_buffer_limit metrics for each
-  ## output, and will flush this buffer on a successful write. Oldest metrics
-  ## are dropped first when this buffer fills.
-  ## This buffer only fills when writes fail to output plugin(s).
-  metric_buffer_limit = 10000
-
-  ## Collection jitter is used to jitter the collection by a random amount.
-  ## Each plugin will sleep for a random time within jitter before collecting.
-  ## This can be used to avoid many plugins querying things like sysfs at the
-  ## same time, which can have a measurable effect on the system.
-  collection_jitter = "30s"
-
-  ## Default flushing interval for all outputs. You shouldn't set this below
-  ## interval. Maximum flush_interval will be flush_interval + flush_jitter
-  flush_interval = "15s"
-  ## Jitter the flush interval by a random amount. This is primarily to avoid
-  ## large write spikes for users running a large number of telegraf instances.
-  ## ie, a jitter of 5s and interval 10s means flushes will happen every 10-15s
-  flush_jitter = "15s"
-
-  ## By default or when set to "0s", precision will be set to the same
-  ## timestamp order as the collection interval, with the maximum being 1s.
-  ##   ie, when interval = "10s", precision will be "1s"
-  ##       when interval = "250ms", precision will be "1ms"
-  ## Precision will NOT be used for service inputs. It is up to each individual
-  ## service input to set the timestamp at the appropriate precision.
-  ## Valid time units are "ns", "us" (or "µs"), "ms", "s".
-  precision = ""
-
-  ## Logging configuration:
-  ## Run telegraf with debug log messages.
-  debug = false
-  ## Run telegraf in quiet mode (error log messages only).
-  quiet = true
-  ## Specify the log file name. The empty string means to log to stderr.
-  logfile = ""
-
-  ## Override default hostname, if empty use os.Hostname()
-  #hostname = "placeholder_hostname"
-  ## If set to true, do no set the "host" tag in the telegraf agent.
-  omit_hostname = true
-
-
-###############################################################################
-#                            OUTPUT PLUGINS                                   #
-###############################################################################
-
-[[outputs.application_insights]]
-  ## Instrumentation key of the Application Insights resource.
-  instrumentation_key = "$TELEMETRY_APPLICATIONINSIGHTS_KEY"
-
-  ## Timeout for closing (default: 5s).
-  # timeout = "5s"
-
-  ## Enable additional diagnostic logging.
-  # enable_diagnostic_logging = false
-
-
-###############################################################################
-#                            PROCESSOR PLUGINS                                #
-###############################################################################
-[[processors.converter]]
-  [processors.converter.fields]
-    float = ["*"]
-
-# Transforms tag and field values as well as measurement, tag and field names with regex pattern
-# [[processors.regex]]
-#   namepass = ["target_allocator"]
-
-#   # Tag and field conversions defined in a separate sub-tables
-#   [[processors.regex.tags]]
-#     ## Tag to change, "*" will change every tag
-#     key = "job_name"
-#     ## Regular expression to match on a tag value
-
-#     # Group 1: match a string starting with "podMonitor/" or "serviceMonitor/"
-#     #          The format of a CR name is podMonitor/<namespace>/<podmonitor-name> or serviceMonitor/<namespace>/<servicemonitor-name>
-#     # Group 2: match the string "podMonitor" or "serviceMonitor"
-#     # Group 3: match any string. We want all job names to be matched so that we aren't collecting the job name.
-#     pattern = '(^(podMonitor|serviceMonitor)\/.*)|(.*)'
-#     ## Matches of the pattern will be replaced with this string.  Use ${1}
-#     ## notation to use the text of the first submatch.
-    
-#     ## "Job" is necessary or else configmap jobs would not be replaced and would keep their
-#     ## original name
-#     replacement = "${2}Job"
-
-###############################################################################
-#                            AGGREGATOR PLUGINS                               #
-###############################################################################
-[[aggregators.quantile]]
-  period = "5m"
-  drop_original = true
-  quantiles = [0.50,0.95]
-  algorithm = "t-digest"
-  compression = 100.0
-  namepass = ["otelcollector", "metricsextension"]
-
-###############################################################################
-#                            INPUT PLUGINS                                    #
-###############################################################################
-
-# Read metrics about cpu usage
-#[[inputs.cpu]]
-  ## Whether to report per-cpu stats or not
-#  percpu = false
-  ## Whether to report total system cpu stats or not
-#  totalcpu = true
-  ## If true, collect raw CPU time metrics.
-#  collect_cpu_time = false
-  ## If true, compute and report the sum of all non-idle CPU states.
-#  report_active = true
-#  fieldpass = ["usage_active","cluster","node","host","device"]
-#  taginclude = ["cluster","cpu","node"]
-  
-# Read metrics about memory usage
-#[[inputs.mem]]
-#  fieldpass = ["used_percent", "cluster", "node","host","device"]
-#  taginclude = ["cluster","node"]
-
-[[inputs.procstat]]
-   exe = "otelcollector"
-   interval = "10s"
-   pid_finder = "pgrep"
-   pid_tag = true
-   name_override = "otelcollector"
-   fieldpass = ["cpu_usage", "memory_rss"]
-   [inputs.procstat.tags]
-#    Computer = "$NODE_NAME"
-#    NodeIp = "$NODE_IP"
-    cpulimit = "$CONTAINER_CPU_LIMIT"
-    memlimit = "$CONTAINER_MEMORY_LIMIT"
-    
-    defaultscrapekubelet = "$AZMON_PROMETHEUS_KUBELET_SCRAPING_ENABLED"
-    defaultscrapecoreDns = "$AZMON_PROMETHEUS_COREDNS_SCRAPING_ENABLED"
-    defaultscrapecadvisor = "$AZMON_PROMETHEUS_CADVISOR_SCRAPING_ENABLED"
-    defaultscrapekubeproxy = "$AZMON_PROMETHEUS_KUBEPROXY_SCRAPING_ENABLED"
-    defaultscrapeapiserver = "$AZMON_PROMETHEUS_APISERVER_SCRAPING_ENABLED"
-    defaultscrapekubestate = "$AZMON_PROMETHEUS_KUBESTATE_SCRAPING_ENABLED"
-    defaultscrapenodeexporter = "$AZMON_PROMETHEUS_NODEEXPORTER_SCRAPING_ENABLED"
-    defaultscrapecollectorhealth = "$AZMON_PROMETHEUS_COLLECTOR_HEALTH_SCRAPING_ENABLED"
-    defaultscrapewindowsexporter = "$AZMON_PROMETHEUS_WINDOWSEXPORTER_SCRAPING_ENABLED"
-    defaultscrapewindowskubeproxy = "$AZMON_PROMETHEUS_WINDOWSKUBEPROXY_SCRAPING_ENABLED"
-    defaultscrapepodannotations = "$AZMON_PROMETHEUS_POD_ANNOTATION_SCRAPING_ENABLED"
-    podannotationns = "$AZMON_PROMETHEUS_POD_ANNOTATION_NAMESPACES_REGEX"
-    defaultscrapekappiebasic = "$AZMON_PROMETHEUS_KAPPIEBASIC_SCRAPING_ENABLED"
-    nodeexportertargetport= "$NODE_EXPORTER_TARGETPORT"
-    nodeexportername = "$NODE_EXPORTER_NAME"
-    kubestatename = "$KUBE_STATE_NAME"
-    kubestateversion = "$KUBE_STATE_VERSION"
-    operatortargetstaimgversion = "$OPERATOR_TARGETS_TA_IMG_VERSION"
-    operatortargetscfgreaderimgversion = "$OPERATOR_TARGETS_CFG_READER_IMG_VERSION"
-    nodeexporterversion = "$NODE_EXPORTER_VERSION"
-    akvauth = "$AKVAUTH"
-    debugmodeenabled = "$DEBUG_MODE_ENABLED"
-    kubestatemetriclabelsallowlist = "$KUBE_STATE_METRIC_LABELS_ALLOWLIST"
-    kubestatemetricannotationsallowlist = "$KUBE_STATE_METRIC_ANNOTATIONS_ALLOWLIST"
-    httpproxyenabled = "$HTTP_PROXY_ENABLED"
-    tadapterh="$tokenadapterHealthyAfterSecs"
-    tadapterf="$tokenadapterUnhealthyAfterSecs"
-  
-[[inputs.procstat]]
-   exe = "MetricsExtension"
-   interval = "10s"
-   pid_finder = "pgrep"
-   pid_tag = true
-   name_override = "metricsextension"
-   fieldpass = ["cpu_usage", "memory_rss"]
-   
-[[inputs.prometheus]]
-  interval = "5m"
-  urls = ["http://localhost:8888/metrics"]
-  fieldpass = ["otelcol_processor_dropped_metric_points", "otelcol_receiver_refused_metric_points", "otelcol_receiver_accepted_metric_points", "otelcol_exporter_sent_metric_points", "otelcol_exporter_queue_size", "otelcol_exporter_send_failed_metric_points", "otelcol_process_memory_rss", "otelcol_processor_batch_batch_send_size_bytes_sum", "otelcol_processor_batch_batch_send_size_bytes_count"]
-  tagexclude = ["service_instance_id"]
-  metric_version = 2
-  url_tag = "scrapeUrl"
-  timeout = "15s"
-
-[[inputs.prometheus]]
-  interval = "5m"
-  urls = ["http://localhost:9090/metrics"]
-  fieldpass = ["prometheus_sd_http_failures_total"]
-  metric_version = 2
-  url_tag = "scrapeUrl"
-  timeout = "15s"
-
-[[inputs.prometheus]]
-  interval = "5m"
-  urls = ["http://ama-metrics-operator-targets.kube-system.svc.cluster.local/metrics"]
-  fieldpass = ["opentelemetry_allocator_targets","opentelemetry_allocator_collectors_discovered"]
-  metric_version = 2
-  url_tag = "scrapeUrl"
-  timeout = "15s"
-  name_override = "target_allocator"
diff --git a/otelcollector/telegraf/telegraf-prometheus-collector.conf b/otelcollector/telegraf/telegraf-prometheus-collector.conf
deleted file mode 100644
index eadc46267..000000000
--- a/otelcollector/telegraf/telegraf-prometheus-collector.conf
+++ /dev/null
@@ -1,217 +0,0 @@
-# Telegraf Configuration
-#
-# Telegraf is entirely plugin driven. All metrics are gathered from the
-# declared inputs, and sent to the declared outputs.
-#
-# Plugins must be declared in here to be active.
-# To deactivate a plugin, comment out the name and any variables.
-#
-# Use 'telegraf -config telegraf.conf -test' to see what metrics a config
-# file would generate.
-#
-# Environment variables can be used anywhere in this config file, simply prepend
-# them with $. For strings the variable must be within quotes (ie, "$STR_VAR"),
-# for numbers and booleans they should be plain (ie, $INT_VAR, $BOOL_VAR)
-
-
-# Global tags can be specified here in key="value" format.
-[global_tags]
-  #Below are entirely used for telemetry
-  agentversion = "$AGENT_VERSION"
-  cluster = "$customResourceId"
-  calias = "$AZMON_CLUSTER_ALIAS"
-  clabel = "$AZMON_CLUSTER_LABEL"
-  Region = "$AKSREGION"
-  computer = "$NODE_NAME"
-  nodeip = "$NODE_IP"
-  mode = "$MODE"
-  winmode = "$WINMODE"
-  macmode = "$MAC"
-  opt = "true"
-  controllertype = "$CONTROLLER_TYPE"
-  defaultmetricaccountname = "$AZMON_DEFAULT_METRIC_ACCOUNT_NAME"
-  namespace = "$POD_NAMESPACE"
-  podname = "$POD_NAME"
-  ostype = "$OS_TYPE"
-  mip = "$MINIMAL_INGESTION_PROFILE"
-  operatormodel = "$AZMON_OPERATOR_ENABLED"
-  operatormodelcfgmapsetting = "$AZMON_OPERATOR_ENABLED_CFG_MAP_SETTING"
-  operatormodelchartsetting = "$AZMON_OPERATOR_ENABLED_CHART_SETTING"
-
-# Configuration for telegraf agent
-[agent]
-  ## Default data collection interval for all inputs
-  interval = "60s"
-  ## Rounds collection interval to 'interval'
-  ## ie, if interval="10s" then always collect on :00, :10, :20, etc.
-  round_interval = false
-
-  ## Telegraf will send metrics to outputs in batches of at most
-  ## metric_batch_size metrics.
-  ## This controls the size of writes that Telegraf sends to output plugins.
-  metric_batch_size = 1000
-
-  ## For failed writes, telegraf will cache metric_buffer_limit metrics for each
-  ## output, and will flush this buffer on a successful write. Oldest metrics
-  ## are dropped first when this buffer fills.
-  ## This buffer only fills when writes fail to output plugin(s).
-  metric_buffer_limit = 10000
-
-  ## Collection jitter is used to jitter the collection by a random amount.
-  ## Each plugin will sleep for a random time within jitter before collecting.
-  ## This can be used to avoid many plugins querying things like sysfs at the
-  ## same time, which can have a measurable effect on the system.
-  collection_jitter = "30s"
-
-  ## Default flushing interval for all outputs. You shouldn't set this below
-  ## interval. Maximum flush_interval will be flush_interval + flush_jitter
-  flush_interval = "30s"
-  ## Jitter the flush interval by a random amount. This is primarily to avoid
-  ## large write spikes for users running a large number of telegraf instances.
-  ## ie, a jitter of 5s and interval 10s means flushes will happen every 10-15s
-  flush_jitter = "15s"
-
-  ## By default or when set to "0s", precision will be set to the same
-  ## timestamp order as the collection interval, with the maximum being 1s.
-  ##   ie, when interval = "10s", precision will be "1s"
-  ##       when interval = "250ms", precision will be "1ms"
-  ## Precision will NOT be used for service inputs. It is up to each individual
-  ## service input to set the timestamp at the appropriate precision.
-  ## Valid time units are "ns", "us" (or "µs"), "ms", "s".
-  precision = ""
-
-  ## Logging configuration:
-  ## Run telegraf with debug log messages.
-  debug = false
-  ## Run telegraf in quiet mode (error log messages only).
-  quiet = true
-  ## Specify the log file name. The empty string means to log to stderr.
-  logfile = ""
-
-  ## Override default hostname, if empty use os.Hostname()
-  #hostname = "placeholder_hostname"
-  ## If set to true, do no set the "host" tag in the telegraf agent.
-  omit_hostname = true
-
-
-###############################################################################
-#                            OUTPUT PLUGINS                                   #
-###############################################################################
-
-[[outputs.application_insights]]
-  ## Instrumentation key of the Application Insights resource.
-  instrumentation_key = "$TELEMETRY_APPLICATIONINSIGHTS_KEY"
-
-  ## Timeout for closing (default: 5s).
-  # timeout = "5s"
-
-  ## Enable additional diagnostic logging.
-  # enable_diagnostic_logging = false
-
-
-###############################################################################
-#                            PROCESSOR PLUGINS                                #
-###############################################################################
-[[processors.converter]]
-  [processors.converter.fields]
-    float = ["*"]
-
-###############################################################################
-#                            AGGREGATOR PLUGINS                               #
-###############################################################################
-[[aggregators.quantile]]
-  period = "5m"
-  drop_original = true
-  quantiles = [0.50,0.95]
-  algorithm = "t-digest"
-  compression = 100.0
-  namepass = ["otelcollector", "metricsextension"]
-
-###############################################################################
-#                            INPUT PLUGINS                                    #
-###############################################################################
-
-# Read metrics about cpu usage
-#[[inputs.cpu]]
-  ## Whether to report per-cpu stats or not
-#  percpu = false
-  ## Whether to report total system cpu stats or not
-#  totalcpu = true
-  ## If true, collect raw CPU time metrics.
-#  collect_cpu_time = false
-  ## If true, compute and report the sum of all non-idle CPU states.
-#  report_active = true
-#  fieldpass = ["usage_active","cluster","node","host","device"]
-#  taginclude = ["cluster","cpu","node"]
-  
-# Read metrics about memory usage
-#[[inputs.mem]]
-#  fieldpass = ["used_percent", "cluster", "node","host","device"]
-#  taginclude = ["cluster","node"]
-
-[[inputs.procstat]]
-   exe = "otelcollector"
-   interval = "10s"
-   pid_finder = "pgrep"
-   pid_tag = true
-   name_override = "otelcollector"
-   fieldpass = ["cpu_usage", "memory_rss"]
-   [inputs.procstat.tags]
-#    Computer = "$NODE_NAME"
-#    NodeIp = "$NODE_IP"
-    cpulimit = "$CONTAINER_CPU_LIMIT"
-    memlimit = "$CONTAINER_MEMORY_LIMIT"
-    
-    defaultscrapekubelet = "$AZMON_PROMETHEUS_KUBELET_SCRAPING_ENABLED"
-    defaultscrapecoreDns = "$AZMON_PROMETHEUS_COREDNS_SCRAPING_ENABLED"
-    defaultscrapecadvisor = "$AZMON_PROMETHEUS_CADVISOR_SCRAPING_ENABLED"
-    defaultscrapekubeproxy = "$AZMON_PROMETHEUS_KUBEPROXY_SCRAPING_ENABLED"
-    defaultscrapeapiserver = "$AZMON_PROMETHEUS_APISERVER_SCRAPING_ENABLED"
-    defaultscrapekubestate = "$AZMON_PROMETHEUS_KUBESTATE_SCRAPING_ENABLED"
-    defaultscrapenodeexporter = "$AZMON_PROMETHEUS_NODEEXPORTER_SCRAPING_ENABLED"
-    defaultscrapecollectorhealth = "$AZMON_PROMETHEUS_COLLECTOR_HEALTH_SCRAPING_ENABLED"
-    defaultscrapewindowsexporter = "$AZMON_PROMETHEUS_WINDOWSEXPORTER_SCRAPING_ENABLED"
-    defaultscrapewindowskubeproxy = "$AZMON_PROMETHEUS_WINDOWSKUBEPROXY_SCRAPING_ENABLED"
-    defaultscrapepodannotations = "$AZMON_PROMETHEUS_POD_ANNOTATION_SCRAPING_ENABLED"
-    podannotationns = "$AZMON_PROMETHEUS_POD_ANNOTATION_NAMESPACES_REGEX"
-    defaultscrapekappiebasic = "$AZMON_PROMETHEUS_KAPPIEBASIC_SCRAPING_ENABLED"
-    defaultscrapenetworkobservabilityRetina = "$AZMON_PROMETHEUS_NETWORKOBSERVABILITYRETINA_SCRAPING_ENABLED"
-    defaultscrapenetworkobservabilityHubble = "$AZMON_PROMETHEUS_NETWORKOBSERVABILITYHUBBLE_SCRAPING_ENABLED"
-    defaultscrapenetworkobservabilityCilium = "$AZMON_PROMETHEUS_NETWORKOBSERVABILITYCILIUM_SCRAPING_ENABLED"
-    nodeexportertargetport= "$NODE_EXPORTER_TARGETPORT"
-    nodeexportername = "$NODE_EXPORTER_NAME"
-    kubestatename = "$KUBE_STATE_NAME"
-    kubestateversion = "$KUBE_STATE_VERSION"
-    nodeexporterversion = "$NODE_EXPORTER_VERSION"
-    akvauth = "$AKVAUTH"
-    debugmodeenabled = "$DEBUG_MODE_ENABLED"
-    kubestatemetriclabelsallowlist = "$KUBE_STATE_METRIC_LABELS_ALLOWLIST"
-    kubestatemetricannotationsallowlist = "$KUBE_STATE_METRIC_ANNOTATIONS_ALLOWLIST"
-    httpproxyenabled = "$HTTP_PROXY_ENABLED"
-    tadapterh="$tokenadapterHealthyAfterSecs"
-    tadapterf="$tokenadapterUnhealthyAfterSecs"
-  
-[[inputs.procstat]]
-   exe = "MetricsExtension"
-   interval = "10s"
-   pid_finder = "pgrep"
-   pid_tag = true
-   name_override = "metricsextension"
-   fieldpass = ["cpu_usage", "memory_rss"]
-   
-[[inputs.prometheus]]
-  interval = "5m"
-  urls = ["http://localhost:8888/metrics"]
-  fieldpass = ["otelcol_processor_dropped_metric_points", "otelcol_receiver_refused_metric_points", "otelcol_receiver_accepted_metric_points", "otelcol_exporter_sent_metric_points", "otelcol_exporter_queue_size", "otelcol_exporter_send_failed_metric_points", "otelcol_process_memory_rss", "otelcol_processor_batch_batch_send_size_bytes_sum", "otelcol_processor_batch_batch_send_size_bytes_count"]
-  tagexclude = ["service_instance_id"]
-  metric_version = 2
-  url_tag = "scrapeUrl"
-  timeout = "15s"
-
-[[inputs.prometheus]]
-  interval = "5m"
-  urls = ["http://localhost:9090/metrics"]
-  fieldpass = ["prometheus_sd_http_failures_total"]
-  metric_version = 2
-  url_tag = "scrapeUrl"
-  timeout = "15s"