Merge branch 'main' of github.com:masastack/MASA.Alert

Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
  <PropertyGroup>
  <MasaFrameworkPackageVersion>1.2.0-preview.2</MasaFrameworkPackageVersion>
- <MasaStackSdksPackageVersion>1.1.1-preview.7</MasaStackSdksPackageVersion>
+ <MasaStackSdksPackageVersion>1.2.1-preview.4</MasaStackSdksPackageVersion>
  </PropertyGroup>
 </Project>

src/Application/Masa.Alert.Application/AlarmRules/EventHandler/SendAlarmNotificationEventHandler.cs

@@ -68,6 +68,7 @@ private async Task AddLogVariablesAsync(AlarmRule alarmRule, Dictionary<string,
  Query = alarmRule.WhereExpression,
  Start = startTime.Value.UtcDateTime,
  End = checkTime.UtcDateTime,
+ Service = alarmRule.AppIdentity,
  IsDesc = true
  };
 

src/Infrastructure/Masa.Alert.NotificationService.Provider.Mc/McNotificationSender.cs

@@ -13,7 +13,15 @@ public McNotificationSender(IMcClient mcClient)
  }
  public async Task SendAsync(NotificationConfig notificationConfig, Dictionary<string, object> variables)
  {
- if (!notificationConfig.Receivers.Any())
+ var channelType = (ChannelTypes)notificationConfig.ChannelType;
+
+ SendTargets? receiverType = notificationConfig.Receivers.Any()
+ ? SendTargets.Assign
+ : channelType == ChannelTypes.WeixinWorkWebhook
+ ? SendTargets.Broadcast
+ : null;
+
+ if (receiverType == null)
  {
  return;
  }
@@ -23,8 +31,9 @@ public async Task SendAsync(NotificationConfig notificationConfig, Dictionary<st
  ChannelCode = notificationConfig.ChannelCode,
  ChannelType = (ChannelTypes)notificationConfig.ChannelType,
  TemplateCode = notificationConfig.TemplateCode,
- ReceiverType = SendTargets.Assign,
- Receivers = notificationConfig.Receivers.Select(x => new InternalReceiverModel {
+ ReceiverType = receiverType.Value,
+ Receivers = notificationConfig.Receivers.Select(x => new InternalReceiverModel
+ {
  Type = MessageTaskReceiverTypes.User,
  SubjectId = x
  }).ToList(),

src/Services/Masa.Alert.Service/Masa.Alert.Service.Admin.csproj

@@ -59,4 +59,8 @@
  <ProjectReference Include="..\..\Infrastructure\Masa.Alert.Infrastructure.Middleware\Masa.Alert.Infrastructure.Middleware.csproj" />
  <ProjectReference Include="..\..\Infrastructure\Masa.Alert.NotificationService.Provider.Mc\Masa.Alert.NotificationService.Provider.Mc.csproj" />
  </ItemGroup>
+
+ <ItemGroup>
+ <Folder Include="Extensions\" />
+ </ItemGroup>
 </Project>

src/Services/Masa.Alert.Service/Program.cs

@@ -6,20 +6,15 @@
 await builder.Services.AddMasaStackConfigAsync(MasaStackProject.Alert, MasaStackApp.Service);
 var masaStackConfig = builder.Services.GetMasaStackConfig();
 
-builder.Services.AddAlertObservable(builder.Logging, () =>
+builder.Services.AddObservable(builder.Logging, new MasaObservableOptions
 {
- return new MasaObservableOptions
- {
- ServiceNameSpace = builder.Environment.EnvironmentName,
- ServiceVersion = masaStackConfig.Version,
- ServiceName = masaStackConfig.GetServiceId(MasaStackProject.Alert),
- Layer = masaStackConfig.Namespace,
- ServiceInstanceId = builder.Configuration.GetValue<string>("HOSTNAME")
- };
-}, () =>
-{
- return masaStackConfig.OtlpUrl;
-});
+ ServiceNameSpace = builder.Environment.EnvironmentName,
+ ServiceVersion = masaStackConfig.Version,
+ ServiceName = masaStackConfig.GetServiceId(MasaStackProject.Alert),
+ Layer = masaStackConfig.Namespace,
+ ServiceInstanceId = builder.Configuration.GetValue<string>("HOSTNAME")!
+}
+, masaStackConfig.OtlpUrl, activitySources: new string[] { CheckAlarmRuleJob.ActivitySource.Name });
 
 builder.Services.AddDaprClient();
 var identityServerUrl = masaStackConfig.GetSsoDomain();

src/Services/Masa.Alert.Service/_Imports.cs

@@ -31,7 +31,7 @@
 global using Masa.BuildingBlocks.Extensions.BackgroundJobs;
 global using Masa.BuildingBlocks.RulesEngine;
 global using Masa.BuildingBlocks.StackSdks.Auth.Contracts;
-global using Masa.BuildingBlocks.StackSdks.Auth.Contracts.Consts;
+global using Masa.BuildingBlocks.StackSdks.Config.Consts;
 global using Masa.Contrib.Caching.Distributed.StackExchangeRedis;
 global using Masa.Contrib.Configuration.ConfigurationApi.Dcc;
 global using Masa.Contrib.Dispatcher.IntegrationEvents.EventLogs.EFCore;