From 9542bbf758967ff9cbc08e47cb53dc9403f43a2b Mon Sep 17 00:00:00 2001 From: ShiranAvidov <48657224+ShiranAvidov@users.noreply.github.com> Date: Mon, 7 Aug 2023 14:52:06 +0300 Subject: [PATCH] upgrade otel (#115) * upgrade otel * change level to info --- .gitignore | 4 ++-- resources/otel/otel_config.yaml | 2 +- resources/otel/receivers/windowseventlog_application.yaml | 7 +++++++ scripts/linux/consts.bash | 2 +- scripts/mac/consts.bash | 2 +- scripts/windows/consts.ps1 | 2 +- 6 files changed, 13 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 1a47d019b..2ff8f78f7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -.idea/* +.idea/** manifest.json -.DS_Store \ No newline at end of file +**/.DS_Store \ No newline at end of file diff --git a/resources/otel/otel_config.yaml b/resources/otel/otel_config.yaml index 8a691cc76..1d1c6831c 100644 --- a/resources/otel/otel_config.yaml +++ b/resources/otel/otel_config.yaml @@ -6,6 +6,6 @@ service: pipelines: telemetry: logs: - level: "debug" + level: "info" metrics: address: localhost:8888 diff --git a/resources/otel/receivers/windowseventlog_application.yaml b/resources/otel/receivers/windowseventlog_application.yaml index 0e8d3a96c..b2d0c1e85 100644 --- a/resources/otel/receivers/windowseventlog_application.yaml +++ b/resources/otel/receivers/windowseventlog_application.yaml @@ -25,9 +25,16 @@ windows_run: | Write-Output "error setting type to windowseventlog/application receiver: $($Err[0])" return 3 } + + $local:Err = Add-YamlFileFieldValue "$LogzioTempDir\resources\otel\receivers\windowseventlog_application.yaml" '.receiver.windowseventlog/application/NAME.exclude_providers' $script:LogzioOtelCollectorServiceName + if ($Err.Count -ne 0) { + Write-Output "error setting type to windowseventlog/application receiver: $($Err[0])" + return 4 + } } receiver: windowseventlog/application/NAME: channel: Application + exclude_providers: [] attributes: type: \ No newline at end of file diff --git a/scripts/linux/consts.bash b/scripts/linux/consts.bash index a73a485bc..7debf5166 100755 --- a/scripts/linux/consts.bash +++ b/scripts/linux/consts.bash @@ -57,7 +57,7 @@ JQ_URL_DOWNLOAD='https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linu # Url for downloading yq binary YQ_URL_DOWNLOAD='https://github.com/mikefarah/yq/releases/download/v4.33.2/yq_linux_amd64.tar.gz' # Url for downloading OTEL collector tar.gz -OTEL_COLLECTOR_URL_DOWNLOAD='https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v0.81.0/otelcol-contrib_0.81.0_linux_amd64.tar.gz' +OTEL_COLLECTOR_URL_DOWNLOAD='https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v0.82.0/otelcol-contrib_0.82.0_linux_amd64.tar.gz' # Url for downloading eksctl tar.gz EKSCTL_URL_DOWNLOAD='https://github.com/weaveworks/eksctl/releases/download/v0.133.0/eksctl_Linux_amd64.tar.gz' # Url for AWS SQS diff --git a/scripts/mac/consts.bash b/scripts/mac/consts.bash index 9b2c42465..b226b20fc 100755 --- a/scripts/mac/consts.bash +++ b/scripts/mac/consts.bash @@ -59,7 +59,7 @@ JQ_URL_DOWNLOAD='https://github.com/stedolan/jq/releases/download/jq-1.6/jq-osx- # Url for downloading yq binary YQ_URL_DOWNLOAD='https://github.com/mikefarah/yq/releases/download/v4.33.2/yq_darwin_amd64.tar.gz' # Url for downloading OTEL collector tar.gz -OTEL_COLLECTOR_URL_DOWNLOAD='https://github.com/logzio/otel-collector-distro/releases/download/v0.81.0/otelcol-logzio-darwin_amd64.tar.gz' +OTEL_COLLECTOR_URL_DOWNLOAD='https://github.com/logzio/otel-collector-distro/releases/download/v0.82.0/otelcol-logzio-darwin_amd64.tar.gz' # Url for downloading eksctl tar.gz EKSCTL_URL_DOWNLOAD='https://github.com/weaveworks/eksctl/releases/download/v0.133.0/eksctl_Darwin_amd64.tar.gz' # Url for AWS SQS diff --git a/scripts/windows/consts.ps1 b/scripts/windows/consts.ps1 index 2b0d31b38..d28566609 100755 --- a/scripts/windows/consts.ps1 +++ b/scripts/windows/consts.ps1 @@ -48,7 +48,7 @@ $script:JqUrlDownload = 'https://github.com/stedolan/jq/releases/download/jq-1.6 # Url for downloading yq exe $script:YqUrlDownload = 'https://github.com/mikefarah/yq/releases/download/v4.27.5/yq_windows_amd64.exe' # Url for downloading OTEL collector zip -$script:OtelCollectorUrlDownload = 'https://github.com/logzio/otel-collector-distro/releases/download/v0.81.0/otelcol-logzio-windows_amd64.zip' +$script:OtelCollectorUrlDownload = 'https://github.com/logzio/otel-collector-distro/releases/download/v0.82.0/otelcol-logzio-windows_amd64.zip' # Url for downloading eksctl zip $script:EksctlUrlDownload = 'https://github.com/weaveworks/eksctl/releases/download/v0.133.0/eksctl_Windows_amd64.zip' # Url for AWS SQS