From 83fd4b7bdf6811ded0c77bce2b0fed37a2ebde58 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 28 Oct 2024 09:40:42 +0000 Subject: [PATCH 1/5] chore(deps): update .net --- src/Promitor.Agents.Core/Promitor.Agents.Core.csproj | 2 +- src/Promitor.Agents.ResourceDiscovery/Dockerfile.linux | 4 ++-- src/Promitor.Agents.ResourceDiscovery/Dockerfile.windows | 4 ++-- .../Promitor.Agents.ResourceDiscovery.csproj | 6 +++--- src/Promitor.Agents.Scraper/Dockerfile.linux | 4 ++-- src/Promitor.Agents.Scraper/Dockerfile.windows | 4 ++-- src/Promitor.Agents.Scraper/Promitor.Agents.Scraper.csproj | 4 ++-- src/Promitor.Core.Telemetry/Promitor.Core.Telemetry.csproj | 4 ++-- src/Promitor.Core/Promitor.Core.csproj | 4 ++-- .../Promitor.Integrations.Azure.csproj | 2 +- .../Promitor.Integrations.AzureStorage.csproj | 2 +- .../Promitor.Integrations.LogAnalytics.csproj | 2 +- .../Promitor.Integrations.Sinks.Atlassian.Statuspage.csproj | 2 +- 13 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/Promitor.Agents.Core/Promitor.Agents.Core.csproj b/src/Promitor.Agents.Core/Promitor.Agents.Core.csproj index f3dc2cc20..9d7dd72ed 100644 --- a/src/Promitor.Agents.Core/Promitor.Agents.Core.csproj +++ b/src/Promitor.Agents.Core/Promitor.Agents.Core.csproj @@ -21,7 +21,7 @@ - + diff --git a/src/Promitor.Agents.ResourceDiscovery/Dockerfile.linux b/src/Promitor.Agents.ResourceDiscovery/Dockerfile.linux index 93b5e4421..c3e641d06 100644 --- a/src/Promitor.Agents.ResourceDiscovery/Dockerfile.linux +++ b/src/Promitor.Agents.ResourceDiscovery/Dockerfile.linux @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:8.0.301-cbl-mariner2.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:8.0.403-cbl-mariner2.0 AS build WORKDIR /src ARG VERSION="UNSET-VERSION" COPY Promitor.Agents.ResourceDiscovery/* Promitor.Agents.ResourceDiscovery/ @@ -14,7 +14,7 @@ COPY Promitor.Integrations.Sinks.Core/* Promitor.Integrations.Sinks.Core/ COPY Promitor.Integrations.Sinks.Prometheus/* Promitor.Integrations.Sinks.Prometheus/ RUN dotnet publish Promitor.Agents.ResourceDiscovery/Promitor.Agents.ResourceDiscovery.csproj --configuration release --output /app /p:Version=$VERSION -FROM mcr.microsoft.com/dotnet/aspnet:8.0.6-cbl-mariner2.0-distroless AS runtime-base +FROM mcr.microsoft.com/dotnet/aspnet:8.0.10-cbl-mariner2.0-distroless AS runtime-base FROM mcr.microsoft.com/cbl-mariner/base/core:2.0 AS installer diff --git a/src/Promitor.Agents.ResourceDiscovery/Dockerfile.windows b/src/Promitor.Agents.ResourceDiscovery/Dockerfile.windows index 63a6430e0..011a15c65 100644 --- a/src/Promitor.Agents.ResourceDiscovery/Dockerfile.windows +++ b/src/Promitor.Agents.ResourceDiscovery/Dockerfile.windows @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:8.0-nanoserver-ltsc2022 AS build +FROM mcr.microsoft.com/dotnet/sdk:9.0-nanoserver-ltsc2022 AS build WORKDIR /src ARG VERSION="UNSET-VERSION" COPY Promitor.Agents.ResourceDiscovery/* Promitor.Agents.ResourceDiscovery/ @@ -14,7 +14,7 @@ COPY Promitor.Integrations.Sinks.Core/* Promitor.Integrations.Sinks.Core/ COPY Promitor.Integrations.Sinks.Prometheus/* Promitor.Integrations.Sinks.Prometheus/ RUN dotnet publish Promitor.Agents.ResourceDiscovery/Promitor.Agents.ResourceDiscovery.csproj --configuration release --output /app /p:Version=%VERSION% -FROM mcr.microsoft.com/dotnet/aspnet:8.0-nanoserver-ltsc2022 AS runtime +FROM mcr.microsoft.com/dotnet/aspnet:9.0-nanoserver-ltsc2022 AS runtime WORKDIR /app ENV PROMITOR_CONFIG_FOLDER="c:/config/" COPY --from=build /app . diff --git a/src/Promitor.Agents.ResourceDiscovery/Promitor.Agents.ResourceDiscovery.csproj b/src/Promitor.Agents.ResourceDiscovery/Promitor.Agents.ResourceDiscovery.csproj index b7d9ca801..ba302d2fd 100644 --- a/src/Promitor.Agents.ResourceDiscovery/Promitor.Agents.ResourceDiscovery.csproj +++ b/src/Promitor.Agents.ResourceDiscovery/Promitor.Agents.ResourceDiscovery.csproj @@ -36,15 +36,15 @@ - + - - + + diff --git a/src/Promitor.Agents.Scraper/Dockerfile.linux b/src/Promitor.Agents.Scraper/Dockerfile.linux index 6249aa420..fee51f801 100644 --- a/src/Promitor.Agents.Scraper/Dockerfile.linux +++ b/src/Promitor.Agents.Scraper/Dockerfile.linux @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:8.0.301-cbl-mariner2.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:8.0.403-cbl-mariner2.0 AS build WORKDIR /src ARG VERSION="UNSET-VERSION" COPY Promitor.Core/* Promitor.Core/ @@ -18,7 +18,7 @@ COPY Promitor.Integrations.Sinks.Statsd/* Promitor.Integrations.Sinks.Statsd/ COPY Promitor.Agents.Scraper/* Promitor.Agents.Scraper/ RUN dotnet publish Promitor.Agents.Scraper/Promitor.Agents.Scraper.csproj --configuration release --output app /p:Version=$VERSION -FROM mcr.microsoft.com/dotnet/aspnet:8.0.6-cbl-mariner2.0-distroless AS runtime-base +FROM mcr.microsoft.com/dotnet/aspnet:8.0.10-cbl-mariner2.0-distroless AS runtime-base FROM mcr.microsoft.com/cbl-mariner/base/core:2.0 AS installer diff --git a/src/Promitor.Agents.Scraper/Dockerfile.windows b/src/Promitor.Agents.Scraper/Dockerfile.windows index 4b0597b02..e5372271b 100644 --- a/src/Promitor.Agents.Scraper/Dockerfile.windows +++ b/src/Promitor.Agents.Scraper/Dockerfile.windows @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:8.0-nanoserver-ltsc2022 AS build +FROM mcr.microsoft.com/dotnet/sdk:9.0-nanoserver-ltsc2022 AS build WORKDIR /src ARG VERSION="UNSET-VERSION" COPY Promitor.Core/* Promitor.Core/ @@ -18,7 +18,7 @@ COPY Promitor.Integrations.Sinks.Statsd/* Promitor.Integrations.Sinks.Statsd/ COPY Promitor.Agents.Scraper/* Promitor.Agents.Scraper/ RUN dotnet publish Promitor.Agents.Scraper/Promitor.Agents.Scraper.csproj --configuration release --output app /p:Version=%VERSION% -FROM mcr.microsoft.com/dotnet/aspnet:8.0-nanoserver-ltsc2022 as runtime +FROM mcr.microsoft.com/dotnet/aspnet:9.0-nanoserver-ltsc2022 as runtime WORKDIR /app ENV PROMITOR_CONFIG_FOLDER="c:/config/" diff --git a/src/Promitor.Agents.Scraper/Promitor.Agents.Scraper.csproj b/src/Promitor.Agents.Scraper/Promitor.Agents.Scraper.csproj index 61165e328..eb6fd8e46 100644 --- a/src/Promitor.Agents.Scraper/Promitor.Agents.Scraper.csproj +++ b/src/Promitor.Agents.Scraper/Promitor.Agents.Scraper.csproj @@ -44,8 +44,8 @@ - - + + diff --git a/src/Promitor.Core.Telemetry/Promitor.Core.Telemetry.csproj b/src/Promitor.Core.Telemetry/Promitor.Core.Telemetry.csproj index 33ca1b172..58723ef56 100644 --- a/src/Promitor.Core.Telemetry/Promitor.Core.Telemetry.csproj +++ b/src/Promitor.Core.Telemetry/Promitor.Core.Telemetry.csproj @@ -15,8 +15,8 @@ - - + + diff --git a/src/Promitor.Core/Promitor.Core.csproj b/src/Promitor.Core/Promitor.Core.csproj index 0ae28e3bd..02666b8a6 100644 --- a/src/Promitor.Core/Promitor.Core.csproj +++ b/src/Promitor.Core/Promitor.Core.csproj @@ -20,8 +20,8 @@ - - + + diff --git a/src/Promitor.Integrations.Azure/Promitor.Integrations.Azure.csproj b/src/Promitor.Integrations.Azure/Promitor.Integrations.Azure.csproj index 973bcd7d4..a14643d0d 100644 --- a/src/Promitor.Integrations.Azure/Promitor.Integrations.Azure.csproj +++ b/src/Promitor.Integrations.Azure/Promitor.Integrations.Azure.csproj @@ -18,7 +18,7 @@ - + diff --git a/src/Promitor.Integrations.AzureStorage/Promitor.Integrations.AzureStorage.csproj b/src/Promitor.Integrations.AzureStorage/Promitor.Integrations.AzureStorage.csproj index 5129656f0..475a6ac8c 100644 --- a/src/Promitor.Integrations.AzureStorage/Promitor.Integrations.AzureStorage.csproj +++ b/src/Promitor.Integrations.AzureStorage/Promitor.Integrations.AzureStorage.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/Promitor.Integrations.LogAnalytics/Promitor.Integrations.LogAnalytics.csproj b/src/Promitor.Integrations.LogAnalytics/Promitor.Integrations.LogAnalytics.csproj index f4909739c..d98a6d19a 100644 --- a/src/Promitor.Integrations.LogAnalytics/Promitor.Integrations.LogAnalytics.csproj +++ b/src/Promitor.Integrations.LogAnalytics/Promitor.Integrations.LogAnalytics.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/Promitor.Integrations.Sinks.Atlassian.Statuspage/Promitor.Integrations.Sinks.Atlassian.Statuspage.csproj b/src/Promitor.Integrations.Sinks.Atlassian.Statuspage/Promitor.Integrations.Sinks.Atlassian.Statuspage.csproj index 3a0fef8d5..379872735 100644 --- a/src/Promitor.Integrations.Sinks.Atlassian.Statuspage/Promitor.Integrations.Sinks.Atlassian.Statuspage.csproj +++ b/src/Promitor.Integrations.Sinks.Atlassian.Statuspage/Promitor.Integrations.Sinks.Atlassian.Statuspage.csproj @@ -15,7 +15,7 @@ - + From 4736bac54292b8a1389a090110321868c5580d42 Mon Sep 17 00:00:00 2001 From: Stephen Chen Date: Tue, 29 Oct 2024 14:49:36 -0700 Subject: [PATCH 2/5] Update src/Promitor.Agents.Scraper/Dockerfile.windows Co-authored-by: Tom Kerkhove --- src/Promitor.Agents.Scraper/Dockerfile.windows | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Promitor.Agents.Scraper/Dockerfile.windows b/src/Promitor.Agents.Scraper/Dockerfile.windows index e5372271b..9d7f0a9e2 100644 --- a/src/Promitor.Agents.Scraper/Dockerfile.windows +++ b/src/Promitor.Agents.Scraper/Dockerfile.windows @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:9.0-nanoserver-ltsc2022 AS build +FROM mcr.microsoft.com/dotnet/sdk:8.0-nanoserver-ltsc2022 AS build WORKDIR /src ARG VERSION="UNSET-VERSION" COPY Promitor.Core/* Promitor.Core/ From a3f53b1ae47e01579a0809cb4805139fa13a7ca2 Mon Sep 17 00:00:00 2001 From: Stephen Chen Date: Tue, 29 Oct 2024 14:49:54 -0700 Subject: [PATCH 3/5] Update src/Promitor.Agents.ResourceDiscovery/Dockerfile.windows Co-authored-by: Tom Kerkhove --- src/Promitor.Agents.ResourceDiscovery/Dockerfile.windows | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Promitor.Agents.ResourceDiscovery/Dockerfile.windows b/src/Promitor.Agents.ResourceDiscovery/Dockerfile.windows index 011a15c65..d7345ab08 100644 --- a/src/Promitor.Agents.ResourceDiscovery/Dockerfile.windows +++ b/src/Promitor.Agents.ResourceDiscovery/Dockerfile.windows @@ -14,7 +14,7 @@ COPY Promitor.Integrations.Sinks.Core/* Promitor.Integrations.Sinks.Core/ COPY Promitor.Integrations.Sinks.Prometheus/* Promitor.Integrations.Sinks.Prometheus/ RUN dotnet publish Promitor.Agents.ResourceDiscovery/Promitor.Agents.ResourceDiscovery.csproj --configuration release --output /app /p:Version=%VERSION% -FROM mcr.microsoft.com/dotnet/aspnet:9.0-nanoserver-ltsc2022 AS runtime +FROM mcr.microsoft.com/dotnet/aspnet:8.0-nanoserver-ltsc2022 AS runtime WORKDIR /app ENV PROMITOR_CONFIG_FOLDER="c:/config/" COPY --from=build /app . From a2834f259730885b0b4c218a3bd806448cd6eedf Mon Sep 17 00:00:00 2001 From: Stephen Chen Date: Tue, 29 Oct 2024 15:03:36 -0700 Subject: [PATCH 4/5] Update src/Promitor.Agents.Scraper/Dockerfile.windows Co-authored-by: Tom Kerkhove --- src/Promitor.Agents.Scraper/Dockerfile.windows | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Promitor.Agents.Scraper/Dockerfile.windows b/src/Promitor.Agents.Scraper/Dockerfile.windows index 9d7f0a9e2..4b0597b02 100644 --- a/src/Promitor.Agents.Scraper/Dockerfile.windows +++ b/src/Promitor.Agents.Scraper/Dockerfile.windows @@ -18,7 +18,7 @@ COPY Promitor.Integrations.Sinks.Statsd/* Promitor.Integrations.Sinks.Statsd/ COPY Promitor.Agents.Scraper/* Promitor.Agents.Scraper/ RUN dotnet publish Promitor.Agents.Scraper/Promitor.Agents.Scraper.csproj --configuration release --output app /p:Version=%VERSION% -FROM mcr.microsoft.com/dotnet/aspnet:9.0-nanoserver-ltsc2022 as runtime +FROM mcr.microsoft.com/dotnet/aspnet:8.0-nanoserver-ltsc2022 as runtime WORKDIR /app ENV PROMITOR_CONFIG_FOLDER="c:/config/" From 2727b23db13f00692df91c45be76a59a6baabe1a Mon Sep 17 00:00:00 2001 From: Stephen Chen Date: Tue, 29 Oct 2024 15:27:43 -0700 Subject: [PATCH 5/5] Update src/Promitor.Agents.ResourceDiscovery/Dockerfile.windows Co-authored-by: Tom Kerkhove --- src/Promitor.Agents.ResourceDiscovery/Dockerfile.windows | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Promitor.Agents.ResourceDiscovery/Dockerfile.windows b/src/Promitor.Agents.ResourceDiscovery/Dockerfile.windows index d7345ab08..63a6430e0 100644 --- a/src/Promitor.Agents.ResourceDiscovery/Dockerfile.windows +++ b/src/Promitor.Agents.ResourceDiscovery/Dockerfile.windows @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:9.0-nanoserver-ltsc2022 AS build +FROM mcr.microsoft.com/dotnet/sdk:8.0-nanoserver-ltsc2022 AS build WORKDIR /src ARG VERSION="UNSET-VERSION" COPY Promitor.Agents.ResourceDiscovery/* Promitor.Agents.ResourceDiscovery/