diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 673358e9d..3fbe5acb6 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -1,5 +1,13 @@ # Azure Monitor Metrics for AKS clusters +## Release tbd +* Linux image - `mcr.microsoft.com/azuremonitor/containerinsights/ciprod/prometheus-collector/images:` +* Windows image - `mcr.microsoft.com/azuremonitor/containerinsights/ciprod/prometheus-collector/images:` +* TA image - `mcr.microsoft.com/azuremonitor/containerinsights/ciprod/prometheus-collector/images:` +* cfg sidecar image - `mcr.microsoft.com/azuremonitor/containerinsights/ciprod/prometheus-collector/images:` +* Change log - + * Update telegraf jitter & disable exemplar for rs - https://github.com/Azure/prometheus-collector/pull/634 + ## Release 10-05-2023 * Linux image - `mcr.microsoft.com/azuremonitor/containerinsights/ciprod/prometheus-collector/images:6.7.7-main-10-06-2023-b75a076c` * Windows image - `mcr.microsoft.com/azuremonitor/containerinsights/ciprod/prometheus-collector/images:6.7.7-main-10-06-2023-b75a076c-win` diff --git a/otelcollector/metricextension/me.config b/otelcollector/metricextension/me.config index ca86de62e..358479326 100644 --- a/otelcollector/metricextension/me.config +++ b/otelcollector/metricextension/me.config @@ -9,6 +9,7 @@ "instance" ], "honorResourceAttributes":true, + "disableExemplars":true, "maxReceiveMessageSizeMBytes": 12 }, "publicationIntervalInSec":20, diff --git a/otelcollector/telegraf/telegraf-prometheus-collector-windows.conf b/otelcollector/telegraf/telegraf-prometheus-collector-windows.conf index 2b9562918..3368d864a 100644 --- a/otelcollector/telegraf/telegraf-prometheus-collector-windows.conf +++ b/otelcollector/telegraf/telegraf-prometheus-collector-windows.conf @@ -27,6 +27,7 @@ mode = "$MODE" winmode = "$WINMODE" macmode = "$MAC" + opt = "true" controllertype = "$CONTROLLER_TYPE" defaultmetricaccountname = "$AZMON_DEFAULT_METRIC_ACCOUNT_NAME" namespace = "$POD_NAMESPACE" @@ -41,7 +42,7 @@ interval = "60s" ## Rounds collection interval to 'interval' ## ie, if interval="10s" then always collect on :00, :10, :20, etc. - round_interval = true + round_interval = false ## Telegraf will send metrics to outputs in batches of at most ## metric_batch_size metrics. @@ -58,15 +59,15 @@ ## 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 = "0s" + 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" + 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 = "0s" + 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. diff --git a/otelcollector/telegraf/telegraf-prometheus-collector.conf b/otelcollector/telegraf/telegraf-prometheus-collector.conf index e44ed5a7b..92628f262 100644 --- a/otelcollector/telegraf/telegraf-prometheus-collector.conf +++ b/otelcollector/telegraf/telegraf-prometheus-collector.conf @@ -27,6 +27,7 @@ mode = "$MODE" winmode = "$WINMODE" macmode = "$MAC" + opt = "true" controllertype = "$CONTROLLER_TYPE" defaultmetricaccountname = "$AZMON_DEFAULT_METRIC_ACCOUNT_NAME" namespace = "$POD_NAMESPACE" @@ -40,7 +41,7 @@ interval = "60s" ## Rounds collection interval to 'interval' ## ie, if interval="10s" then always collect on :00, :10, :20, etc. - round_interval = true + round_interval = false ## Telegraf will send metrics to outputs in batches of at most ## metric_batch_size metrics. @@ -57,15 +58,15 @@ ## 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 = "0s" + 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" + 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 = "0s" + 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.