Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update telemetry jitter from telegraf #634

Merged
merged 7 commits into from
Oct 18, 2023
Merged

update telemetry jitter from telegraf #634

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a486d62
try-1
vishiy Oct 12, 2023
24090d9
UP GO
vishiy Oct 13, 2023
53ab7d3
disable exemplars in rs
vishiy Oct 16, 2023
910dfd7
remove private branch
vishiy Oct 16, 2023
f39f7e2
add branch
vishiy Oct 16, 2023
98b3744
revert go update
vishiy Oct 18, 2023
c043db5
update readme
vishiy Oct 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .pipelines/azure-pipeline-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ trigger:
branches:
include:
- main
- vishwa/10022023-upgrade
pr:
autoCancel: true
branches:
Expand Down
8 changes: 8 additions & 0 deletions RELEASENOTES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Azure Monitor Metrics for AKS clusters

## Release tbd
* 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>`
* 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`
Expand Down
1 change: 1 addition & 0 deletions otelcollector/metricextension/me.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"instance"
],
"honorResourceAttributes":true,
"disableExemplars":true,
"maxReceiveMessageSizeMBytes": 12
},
"publicationIntervalInSec":20,
Expand Down
9 changes: 5 additions & 4 deletions otelcollector/telegraf/telegraf-prometheus-collector-windows.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
mode = "$MODE"
winmode = "$WINMODE"
macmode = "$MAC"
opt = "true"
controllertype = "$CONTROLLER_TYPE"
defaultmetricaccountname = "$AZMON_DEFAULT_METRIC_ACCOUNT_NAME"
namespace = "$POD_NAMESPACE"
Expand All @@ -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.
Expand All @@ -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.
Expand Down
9 changes: 5 additions & 4 deletions otelcollector/telegraf/telegraf-prometheus-collector.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
mode = "$MODE"
winmode = "$WINMODE"
macmode = "$MAC"
opt = "true"
vishiy marked this conversation as resolved.
Show resolved Hide resolved
controllertype = "$CONTROLLER_TYPE"
defaultmetricaccountname = "$AZMON_DEFAULT_METRIC_ACCOUNT_NAME"
namespace = "$POD_NAMESPACE"
Expand All @@ -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.
Expand All @@ -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.
Expand Down