From 5cece3993bbca8c4162601af97337564f3f78001 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20=C5=9Awi=C4=85tek?= Date: Wed, 3 Apr 2024 15:25:34 +0200 Subject: [PATCH] feat(msi): add fips support --- .../SumoLogicTests/TestData/with-extensions-block.yaml | 10 +++++----- .../TestData/without-extensions-block.yaml | 10 +++++----- msi/wix/assets/common.yaml | 3 +++ msi/wix/otelcol-sumo.wixproj | 10 +++++++++- 4 files changed, 22 insertions(+), 11 deletions(-) create mode 100644 msi/wix/assets/common.yaml diff --git a/msi/SumoLogic.wixext/SumoLogicTests/TestData/with-extensions-block.yaml b/msi/SumoLogic.wixext/SumoLogicTests/TestData/with-extensions-block.yaml index b991a645..51af6f1d 100644 --- a/msi/SumoLogic.wixext/SumoLogicTests/TestData/with-extensions-block.yaml +++ b/msi/SumoLogic.wixext/SumoLogicTests/TestData/with-extensions-block.yaml @@ -67,8 +67,8 @@ processors: ## Configuration for Sumo Logic Schema Processor ## The Sumo Logic Schema processor modifies the metadata on logs, metrics and traces sent to Sumo Logic ## so that the Sumo Logic apps can make full use of the ingested data. - ## ref: https://github.com/SumoLogic/sumologic-otel-collector/tree/main/pkg/processor/sumologicschemaprocessor - sumologic_schema: + ## ref: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/sumologicprocessor + sumologic: service: extensions: @@ -82,7 +82,7 @@ service: processors: - memory_limiter - batch - - sumologic_schema + - sumologic exporters: - sumologic logs/default: @@ -91,7 +91,7 @@ service: processors: - memory_limiter - batch - - sumologic_schema + - sumologic exporters: - sumologic traces/default: @@ -100,6 +100,6 @@ service: processors: - memory_limiter - batch - - sumologic_schema + - sumologic exporters: - sumologic diff --git a/msi/SumoLogic.wixext/SumoLogicTests/TestData/without-extensions-block.yaml b/msi/SumoLogic.wixext/SumoLogicTests/TestData/without-extensions-block.yaml index 0c47e09a..991fbbf5 100644 --- a/msi/SumoLogic.wixext/SumoLogicTests/TestData/without-extensions-block.yaml +++ b/msi/SumoLogic.wixext/SumoLogicTests/TestData/without-extensions-block.yaml @@ -48,8 +48,8 @@ processors: ## Configuration for Sumo Logic Schema Processor ## The Sumo Logic Schema processor modifies the metadata on logs, metrics and traces sent to Sumo Logic ## so that the Sumo Logic apps can make full use of the ingested data. - ## ref: https://github.com/SumoLogic/sumologic-otel-collector/tree/main/pkg/processor/sumologicschemaprocessor - sumologic_schema: + ## ref: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/sumologicprocessor + sumologic: service: extensions: @@ -63,7 +63,7 @@ service: processors: - memory_limiter - batch - - sumologic_schema + - sumologic exporters: - sumologic logs/default: @@ -72,7 +72,7 @@ service: processors: - memory_limiter - batch - - sumologic_schema + - sumologic exporters: - sumologic traces/default: @@ -81,6 +81,6 @@ service: processors: - memory_limiter - batch - - sumologic_schema + - sumologic exporters: - sumologic diff --git a/msi/wix/assets/common.yaml b/msi/wix/assets/common.yaml new file mode 100644 index 00000000..3e7d24c6 --- /dev/null +++ b/msi/wix/assets/common.yaml @@ -0,0 +1,3 @@ +extensions: + sumologic: + installation_token: diff --git a/msi/wix/otelcol-sumo.wixproj b/msi/wix/otelcol-sumo.wixproj index cd51f157..803aa2f9 100644 --- a/msi/wix/otelcol-sumo.wixproj +++ b/msi/wix/otelcol-sumo.wixproj @@ -7,6 +7,7 @@ en-US none $([System.IO.Path]::GetFullPath('..\..')) + false @@ -14,11 +15,18 @@ - otelcol-sumo_$(ProductVersion)_en-US.$(Platform) bin\$(Platform)\ obj\$(Platform)\ + + otelcol-sumo_$(ProductVersion)_en-US.$(Platform) + + + + otelcol-sumo_$(ProductVersion)_en-US.$(Platform)-fips + + $(DefineConstants);ProductVersion=$(ProductVersion) $(DefineConstants);UpgradeCode=$(UpgradeCode)