From 40bff1bdbddd326ebac07890ebc3c9f3c244af6c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2024 02:23:28 +0000 Subject: [PATCH 01/29] Bump Particular.Packaging from 4.1.0 to 4.2.0 in /src Bumps [Particular.Packaging](https://github.com/Particular/Particular.Packaging) from 4.1.0 to 4.2.0. - [Commits](https://github.com/Particular/Particular.Packaging/compare/4.1.0...4.2.0) --- updated-dependencies: - dependency-name: Particular.Packaging dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .../Particular.PlatformSample.ServicePulse.csproj | 2 +- src/ServicePulse.Host/ServicePulse.Host.csproj | 2 +- src/ServicePulse/ServicePulse.csproj | 2 +- src/Setup/Setup.csproj | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Particular.PlatformSample.ServicePulse/Particular.PlatformSample.ServicePulse.csproj b/src/Particular.PlatformSample.ServicePulse/Particular.PlatformSample.ServicePulse.csproj index 3752a91b5e..b481204854 100644 --- a/src/Particular.PlatformSample.ServicePulse/Particular.PlatformSample.ServicePulse.csproj +++ b/src/Particular.PlatformSample.ServicePulse/Particular.PlatformSample.ServicePulse.csproj @@ -15,7 +15,7 @@ - + diff --git a/src/ServicePulse.Host/ServicePulse.Host.csproj b/src/ServicePulse.Host/ServicePulse.Host.csproj index 98160bca7f..4e5992f495 100644 --- a/src/ServicePulse.Host/ServicePulse.Host.csproj +++ b/src/ServicePulse.Host/ServicePulse.Host.csproj @@ -15,7 +15,7 @@ - + diff --git a/src/ServicePulse/ServicePulse.csproj b/src/ServicePulse/ServicePulse.csproj index 3d78a7d46f..9ba8cd8baf 100644 --- a/src/ServicePulse/ServicePulse.csproj +++ b/src/ServicePulse/ServicePulse.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/Setup/Setup.csproj b/src/Setup/Setup.csproj index 31569ec11a..fd4730f192 100644 --- a/src/Setup/Setup.csproj +++ b/src/Setup/Setup.csproj @@ -14,7 +14,7 @@ - + From 03152f83ac39975b9ba56653c0045240c15b6128 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2024 02:24:06 +0000 Subject: [PATCH 02/29] Bump Microsoft.NET.Test.Sdk from 17.11.1 to 17.12.0 in /src Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 17.11.1 to 17.12.0. - [Release notes](https://github.com/microsoft/vstest/releases) - [Changelog](https://github.com/microsoft/vstest/blob/main/docs/releases.md) - [Commits](https://github.com/microsoft/vstest/compare/v17.11.1...v17.12.0) --- updated-dependencies: - dependency-name: Microsoft.NET.Test.Sdk dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/ServicePulse.Host.Tests/ServicePulse.Host.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ServicePulse.Host.Tests/ServicePulse.Host.Tests.csproj b/src/ServicePulse.Host.Tests/ServicePulse.Host.Tests.csproj index 2896f0575a..6eb2c2072a 100644 --- a/src/ServicePulse.Host.Tests/ServicePulse.Host.Tests.csproj +++ b/src/ServicePulse.Host.Tests/ServicePulse.Host.Tests.csproj @@ -10,7 +10,7 @@ - + From acf512ff62e12b994c9f5aa09c73d9b3c5bddf3c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Dec 2024 17:21:08 +0000 Subject: [PATCH 03/29] Bump actions/upload-artifact from 4.4.3 to 4.5.0 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.4.3 to 4.5.0. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v4.4.3...v4.5.0) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yml | 4 ++-- .github/workflows/release.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b344647443..9b43ae243e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -41,13 +41,13 @@ jobs: uses: Particular/run-tests-action@v1.7.0 # Upload assets and packages - name: Upload assets - uses: actions/upload-artifact@v4.4.3 + uses: actions/upload-artifact@v4.5.0 with: name: Assets path: src/ServicePulse.Host/bin/Release/ retention-days: 7 - name: Upload packages - uses: actions/upload-artifact@v4.4.3 + uses: actions/upload-artifact@v4.5.0 with: name: NuGet packages path: nugets/ diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9a560eece4..ee184b331a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -67,7 +67,7 @@ jobs: run: dotnet build src/Setup --configuration Release # Upload artifacts - name: Publish artifacts - uses: actions/upload-artifact@v4.4.3 + uses: actions/upload-artifact@v4.5.0 with: name: artifacts path: | From 98fc4b33fd459c5db1cbcf960c16eca1de599f74 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 27 Dec 2024 17:45:59 +0000 Subject: [PATCH 04/29] Bump actions/setup-dotnet from 4.1.0 to 4.2.0 Bumps [actions/setup-dotnet](https://github.com/actions/setup-dotnet) from 4.1.0 to 4.2.0. - [Release notes](https://github.com/actions/setup-dotnet/releases) - [Commits](https://github.com/actions/setup-dotnet/compare/v4.1.0...v4.2.0) --- updated-dependencies: - dependency-name: actions/setup-dotnet dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yml | 2 +- .github/workflows/release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9b43ae243e..bb0221ceb9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: with: fetch-depth: 0 - name: Setup .NET SDK - uses: actions/setup-dotnet@v4.1.0 + uses: actions/setup-dotnet@v4.2.0 with: dotnet-version: 7.0.x - name: Set up Node.js diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ee184b331a..93097fdaa9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -26,7 +26,7 @@ jobs: with: fetch-depth: 0 - name: Setup .NET SDK - uses: actions/setup-dotnet@v4.1.0 + uses: actions/setup-dotnet@v4.2.0 with: dotnet-version: 7.0.x - name: Set up Node.js From 6eb6bdba14a614e41c036a69923d94b5f2e8ca7d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 9 Jan 2025 17:51:34 +0000 Subject: [PATCH 05/29] Bump actions/upload-artifact from 4.5.0 to 4.6.0 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.5.0 to 4.6.0. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v4.5.0...v4.6.0) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yml | 4 ++-- .github/workflows/release.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bb0221ceb9..446e15edb1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -41,13 +41,13 @@ jobs: uses: Particular/run-tests-action@v1.7.0 # Upload assets and packages - name: Upload assets - uses: actions/upload-artifact@v4.5.0 + uses: actions/upload-artifact@v4.6.0 with: name: Assets path: src/ServicePulse.Host/bin/Release/ retention-days: 7 - name: Upload packages - uses: actions/upload-artifact@v4.5.0 + uses: actions/upload-artifact@v4.6.0 with: name: NuGet packages path: nugets/ diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 93097fdaa9..e96fde4e74 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -67,7 +67,7 @@ jobs: run: dotnet build src/Setup --configuration Release # Upload artifacts - name: Publish artifacts - uses: actions/upload-artifact@v4.5.0 + uses: actions/upload-artifact@v4.6.0 with: name: artifacts path: | From 8f2bff10722340dc4af3ae84c69bae422fc0ce7c Mon Sep 17 00:00:00 2001 From: John Simons Date: Thu, 16 Jan 2025 14:52:28 +1000 Subject: [PATCH 06/29] Disable sync and dependabot --- .github/dependabot.yml | 47 ---------------------------------- .github/workflows/ci.yml | 54 ---------------------------------------- .reposync.yml | 3 --- 3 files changed, 104 deletions(-) delete mode 100644 .github/dependabot.yml delete mode 100644 .github/workflows/ci.yml delete mode 100644 .reposync.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index 84eecf21d5..0000000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,47 +0,0 @@ -version: 2 -updates: -- package-ecosystem: nuget - directory: "/src" - schedule: - interval: daily - open-pull-requests-limit: 1000 - groups: - AWSSDK: - patterns: - - "AWSSDK.*" - NServiceBusCore: - patterns: - - "NServiceBus" - - "NServiceBus.AcceptanceTesting" - - "NServiceBus.AcceptanceTests.Sources" - - "NServiceBus.PersistenceTests.Sources" - - "NServiceBus.TransportTests.Sources" - ignore: - # Particular.Analyzers updates are distributed via RepoStandards - - dependency-name: "Particular.Analyzers" - # Changing these 3 dependencies affects the .NET SDK and Visual Studio versions we support - # These types of updates should be more intentional than an automated update - - dependency-name: "Microsoft.Build.Utilities.Core" - - dependency-name: "Microsoft.CodeAnalysis.CSharp" - - dependency-name: "Microsoft.CodeAnalysis.CSharp.Workspaces" -- package-ecosystem: "github-actions" - directory: "/" - schedule: - interval: daily - open-pull-requests-limit: 1000 -- package-ecosystem: "docker" - directory: "/src/ServicePulse" - schedule: - interval: daily - open-pull-requests-limit: 1000 -- package-ecosystem: "npm" - directory: "/src/Frontend" - schedule: - interval: daily - open-pull-requests-limit: 1000 - groups: - patch-updates: - applies-to: version-updates - update-types: - - "patch" - diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml deleted file mode 100644 index 446e15edb1..0000000000 --- a/.github/workflows/ci.yml +++ /dev/null @@ -1,54 +0,0 @@ -name: CI -on: - push: - branches: - - master - - release-* - pull_request: - workflow_dispatch: -env: - DOTNET_NOLOGO: true -jobs: - build: - name: Windows - runs-on: windows-2022 - steps: - - name: Checkout - uses: actions/checkout@v4.2.2 - with: - fetch-depth: 0 - - name: Setup .NET SDK - uses: actions/setup-dotnet@v4.2.0 - with: - dotnet-version: 7.0.x - - name: Set up Node.js - uses: actions/setup-node@v4.1.0 - with: - node-version: 21.6.x - - name: Build Frontend - run: .\build.ps1 - working-directory: src/ServicePulse.Host - - name: Run component tests - run: npm run test:component - working-directory: src/Frontend - - name: Run application tests - run: npm run test:application - working-directory: src/Frontend - # .NET Build and run tests - - name: Build - run: dotnet build src --configuration Release - - name: Run .NET tests - uses: Particular/run-tests-action@v1.7.0 - # Upload assets and packages - - name: Upload assets - uses: actions/upload-artifact@v4.6.0 - with: - name: Assets - path: src/ServicePulse.Host/bin/Release/ - retention-days: 7 - - name: Upload packages - uses: actions/upload-artifact@v4.6.0 - with: - name: NuGet packages - path: nugets/ - retention-days: 7 diff --git a/.reposync.yml b/.reposync.yml deleted file mode 100644 index 63909aba71..0000000000 --- a/.reposync.yml +++ /dev/null @@ -1,3 +0,0 @@ -exclusions: -- src/NServiceBus.snk -- .github/dependabot.yml From 77941f875763b8fd5abd145ac0d41368e760f799 Mon Sep 17 00:00:00 2001 From: Phil Bastian Date: Mon, 4 Nov 2024 09:22:52 +0800 Subject: [PATCH 07/29] conditionally show messages according to configuration definition of mass transit presence --- .../failedmessages/DeletedMessages.vue | 15 +++------------ .../components/failedmessages/MessageView.vue | 16 ++++++---------- .../src/components/monitoring/MonitoringHead.vue | 6 ++++++ src/Frontend/src/composables/configuration.ts | 15 +++++++++++++++ .../src/composables/connectedApplications.ts | 7 +++++++ src/Frontend/src/resources/Configuration.ts | 4 ++++ src/Frontend/src/views/DashboardView.vue | 14 +++++++++++--- src/Frontend/src/views/HeartbeatsView.vue | 6 ++++++ 8 files changed, 58 insertions(+), 25 deletions(-) create mode 100644 src/Frontend/src/composables/configuration.ts create mode 100644 src/Frontend/src/composables/connectedApplications.ts diff --git a/src/Frontend/src/components/failedmessages/DeletedMessages.vue b/src/Frontend/src/components/failedmessages/DeletedMessages.vue index 3721816dc8..678e15c455 100644 --- a/src/Frontend/src/components/failedmessages/DeletedMessages.vue +++ b/src/Frontend/src/components/failedmessages/DeletedMessages.vue @@ -1,5 +1,5 @@ diff --git a/src/Frontend/src/composables/configuration.ts b/src/Frontend/src/composables/configuration.ts new file mode 100644 index 0000000000..ea06003fa7 --- /dev/null +++ b/src/Frontend/src/composables/configuration.ts @@ -0,0 +1,15 @@ +import Configuration from "@/resources/Configuration"; +import { ref } from "vue"; +import { useFetchFromServiceControl } from "./serviceServiceControlUrls"; + +export function useConfiguration() { + const configuration = ref(null); + + async function populate() { + const response = await useFetchFromServiceControl("configuration"); + configuration.value = await response.json(); + } + populate(); + + return configuration; +} diff --git a/src/Frontend/src/composables/connectedApplications.ts b/src/Frontend/src/composables/connectedApplications.ts new file mode 100644 index 0000000000..da484b1990 --- /dev/null +++ b/src/Frontend/src/composables/connectedApplications.ts @@ -0,0 +1,7 @@ +import { computed } from "vue"; +import { useConfiguration } from "./configuration"; + +export function useIsMassTransitConnected() { + const configuration = useConfiguration(); + return computed(() => configuration.value?.connected_applications?.connected_applications?.includes("MassTransitConnector")); +} diff --git a/src/Frontend/src/resources/Configuration.ts b/src/Frontend/src/resources/Configuration.ts index e1a303d218..2bfa36667e 100644 --- a/src/Frontend/src/resources/Configuration.ts +++ b/src/Frontend/src/resources/Configuration.ts @@ -4,6 +4,10 @@ export default interface Configuration { performance_tunning: Performancetunning; transport: Transport; plugins: Plugins; + connected_applications: ConnectedApplications; +} +interface ConnectedApplications { + connected_applications: string[]; } interface Plugins { heartbeat_grace_period: string; diff --git a/src/Frontend/src/views/DashboardView.vue b/src/Frontend/src/views/DashboardView.vue index 39f00c7c83..e8d661439d 100644 --- a/src/Frontend/src/views/DashboardView.vue +++ b/src/Frontend/src/views/DashboardView.vue @@ -22,13 +22,13 @@ import FailedMessagesDashboardItem from "@/components/failedmessages/FailedMessa
-
+
-
+
-
+
@@ -48,4 +48,12 @@ import FailedMessagesDashboardItem from "@/components/failedmessages/FailedMessa border-color: #eee !important; cursor: default; } + +.system-status .row { + display: flex; +} + +.system-status-item { + flex: 1; +} diff --git a/src/Frontend/src/views/HeartbeatsView.vue b/src/Frontend/src/views/HeartbeatsView.vue index ac11a587f4..edd7607a23 100644 --- a/src/Frontend/src/views/HeartbeatsView.vue +++ b/src/Frontend/src/views/HeartbeatsView.vue @@ -7,9 +7,12 @@ import { storeToRefs } from "pinia"; import ServiceControlAvailable from "@/components/ServiceControlAvailable.vue"; import LicenseNotExpired from "@/components/LicenseNotExpired.vue"; import FilterInput from "@/components/FilterInput.vue"; +import { useIsMassTransitConnected } from "@/composables/connectedApplications"; const store = useHeartbeatsStore(); const { unhealthyEndpoints, healthyEndpoints, endpointFilterString } = storeToRefs(store); + +const isMassTransitConnected = useIsMassTransitConnected(); diff --git a/src/Frontend/src/views/HeartbeatsView.vue b/src/Frontend/src/views/HeartbeatsView.vue index edd7607a23..b02838bcd4 100644 --- a/src/Frontend/src/views/HeartbeatsView.vue +++ b/src/Frontend/src/views/HeartbeatsView.vue @@ -24,7 +24,7 @@ const isMassTransitConnected = useIsMassTransitConnected();

Endpoint Heartbeats

-
Note: MassTransit endpoints are currently not supported by heartbeat functionality and will not show in this view.
+
MassTransit endpoints are currently not supported by heartbeat functionality and will not show in this view.
From f519cb3d428c2ef5ac80ec728f9a88a88783479e Mon Sep 17 00:00:00 2001 From: John Simons Date: Thu, 16 Jan 2025 14:45:17 +1000 Subject: [PATCH 17/29] A small fix --- .../src/components/failedmessages/MessageView.vue | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/Frontend/src/components/failedmessages/MessageView.vue b/src/Frontend/src/components/failedmessages/MessageView.vue index 602cf37ab1..3c49683f23 100644 --- a/src/Frontend/src/components/failedmessages/MessageView.vue +++ b/src/Frontend/src/components/failedmessages/MessageView.vue @@ -402,8 +402,8 @@ onUnmounted(() => { - - + +