230724

Tynab · Jul 23, 2023 · 299d442 · 299d442
1 parent a3000c9
commit 299d442
Show file tree

Hide file tree

Showing 78 changed files with 1,658 additions and 338 deletions.
diff --git a/console/YANLib.Benchmarks/YANLib.Benchmarks.csproj b/console/YANLib.Benchmarks/YANLib.Benchmarks.csproj
@@ -1,19 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
+	<PropertyGroup>
+		<OutputType>Exe</OutputType>
+		<TargetFramework>net6.0</TargetFramework>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.5" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-  </ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="BenchmarkDotNet" Version="0.13.5" />
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\lib\YANLib\YANLib.csproj" />
-  </ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\..\lib\YANLib\YANLib.csproj" />
+	</ItemGroup>
 
 </Project>
diff --git a/docker-compose.dcproj b/docker-compose.dcproj
@@ -18,6 +18,9 @@
     <None Include="elasticsearch\.dockerignore" />
     <None Include="elasticsearch\config\elasticsearch.yml" />
     <None Include="elasticsearch\Dockerfile" />
+    <None Include="es-ingest\.dockerignore" />
+    <None Include="es-ingest\config\elasticsearch.yml" />
+    <None Include="es-ingest\Dockerfile" />
     <None Include="extensions\curator\.dockerignore" />
     <None Include="extensions\curator\config\curator.yml" />
     <None Include="extensions\curator\config\delete_log_files_curator.yml" />

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -107,7 +107,7 @@ services:
     depends_on:
       - elasticsearch
     restart: unless-stopped
-
+    
   rabbitmq:
     image: rabbitmq:3-management
     container_name: rabbitmq
@@ -119,8 +119,6 @@ services:
       RABBITMQ_DEFAULT_PASS: ${RABBITMQ_DEFAULT_PASS:-}
     networks:
       - yan
-    depends_on:
-      - logstash
     restart: unless-stopped
 
   zookeeper:
@@ -132,8 +130,6 @@ services:
       - ALLOW_ANONYMOUS_LOGIN=yes
     networks:
       - yan
-    depends_on:
-      - logstash
     restart: unless-stopped
 
   kafka:
@@ -183,6 +179,7 @@ networks:
 volumes:
   setup:
   elasticsearch:
+  es-ingest:
 
 # Run with
 #   docker-compose \

diff --git a/es-ingest/.dockerignore b/es-ingest/.dockerignore
@@ -0,0 +1,6 @@
+# Ignore Docker build files
+Dockerfile
+.dockerignore
+
+# Ignore OS artifacts
+**/.DS_Store
diff --git a/es-ingest/Dockerfile b/es-ingest/Dockerfile
@@ -0,0 +1,7 @@
+ARG ELASTIC_VERSION
+
+# https://www.docker.elastic.co/
+FROM docker.elastic.co/elasticsearch/elasticsearch:${ELASTIC_VERSION}
+
+# Add your elasticsearch plugins setup here
+# Example: RUN elasticsearch-plugin install analysis-icu
diff --git a/es-ingest/config/elasticsearch.yml b/es-ingest/config/elasticsearch.yml
@@ -0,0 +1,18 @@
+---
+## Default Elasticsearch configuration from Elasticsearch base image.
+## https://github.com/elastic/elasticsearch/blob/main/distribution/docker/src/docker/config/elasticsearch.yml
+#
+cluster.name: docker-cluster-neo
+network.host: 0.0.0.0
+
+## X-Pack settings
+## see https://www.elastic.co/guide/en/elasticsearch/reference/current/security-settings.html
+#
+xpack.license.self_generated.type: trial
+xpack.security.enabled: true
+
+# server.publicBaseUrl: https://my-elasticsearch-cluster.example.com
+
+## Set the built-in users' passwords.
+# Run the following command from the Elasticsearch directory:
+# ./bin/elasticsearch-setup-passwords interactive
diff --git a/extensions/curator/curator-compose.yml b/extensions/curator/curator-compose.yml
@@ -4,10 +4,11 @@ services:
   curator:
     build:
       context: extensions/curator/
+    container_name: curator
     init: true
     volumes:
-      - ./config/curator.yml:/.curator/curator.yml:ro,Z
-      - ./config/delete_log_files_curator.yml:/.curator/delete_log_files_curator.yml:ro,Z
+      - ./extensions/curator/config/curator.yml:/.curator/curator.yml:ro,Z
+      - ./extensions/curator/config/delete_log_files_curator.yml:/.curator/delete_log_files_curator.yml:ro,Z
     environment:
       ELASTIC_PASSWORD: ${ELASTIC_PASSWORD:-}
     networks:

diff --git a/extensions/enterprise-search/config/enterprise-search.yml b/extensions/enterprise-search/config/enterprise-search.yml
@@ -6,7 +6,7 @@
 ## --------------------- REQUIRED ---------------------
 
 # Encryption keys to protect application secrets.
-secret_management.encryption_keys:
+secret_management.encryption_keys: [680f94e568c90364bedf927b2f0f49609702d3eab9098688585a375b14274546]
   # example:
   #- 680f94e568c90364bedf927b2f0f49609702d3eab9098688585a375b14274546
 

diff --git a/extensions/enterprise-search/enterprise-search-compose.yml b/extensions/enterprise-search/enterprise-search-compose.yml
@@ -6,8 +6,9 @@ services:
       context: extensions/enterprise-search/
       args:
         ELASTIC_VERSION: ${ELASTIC_VERSION}
+    container_name: enterprise-search
     volumes:
-      - ./config/enterprise-search.yml:/usr/share/enterprise-search/config/enterprise-search.yml:ro,Z
+      - ./extensions/enterprise-search/config/enterprise-search.yml:/usr/share/enterprise-search/config/enterprise-search.yml:ro,Z
     environment:
       JAVA_OPTS: -Xms2g -Xmx2g
       ENT_SEARCH_DEFAULT_PASSWORD: 'changeme'

diff --git a/extensions/filebeat/filebeat-compose.yml b/extensions/filebeat/filebeat-compose.yml
@@ -8,6 +8,7 @@ services:
         ELASTIC_VERSION: ${ELASTIC_VERSION}
     # Run as 'root' instead of 'filebeat' (uid 1000) to allow reading
     # 'docker.sock' and the host's filesystem.
+    container_name: filebeat
     user: root
     command:
       # Log to stderr.
@@ -17,7 +18,7 @@ services:
       # see: https://www.elastic.co/guide/en/beats/libbeat/current/config-file-permissions.html
       - --strict.perms=false
     volumes:
-      - ./config/filebeat.yml:/usr/share/filebeat/filebeat.yml:ro,Z
+      - ./extensions/filebeat/config/filebeat.yml:/usr/share/filebeat/filebeat.yml:ro,Z
       - type: bind
         source: /var/lib/docker/containers
         target: /var/lib/docker/containers

diff --git a/extensions/fleet/agent-apmserver-compose.yml b/extensions/fleet/agent-apmserver-compose.yml
@@ -10,6 +10,7 @@ services:
       context: extensions/fleet/
       args:
         ELASTIC_VERSION: ${ELASTIC_VERSION}
+    container_name: apm-server
     volumes:
       - apm-server:/usr/share/elastic-agent/state:Z
     environment:

diff --git a/extensions/fleet/fleet-compose.yml b/extensions/fleet/fleet-compose.yml
@@ -6,6 +6,7 @@ services:
       context: extensions/fleet/
       args:
         ELASTIC_VERSION: ${ELASTIC_VERSION}
+    container_name: fleet-server
     volumes:
       - fleet-server:/usr/share/elastic-agent/state:Z
     environment:

diff --git a/extensions/heartbeat/heartbeat-compose.yml b/extensions/heartbeat/heartbeat-compose.yml
@@ -6,6 +6,7 @@ services:
       context: extensions/heartbeat/
       args:
         ELASTIC_VERSION: ${ELASTIC_VERSION}
+    container_name: heartbeat
     command:
       # Log to stderr.
       - -e
@@ -14,7 +15,7 @@ services:
       # see: https://www.elastic.co/guide/en/beats/libbeat/current/config-file-permissions.html
       - --strict.perms=false
     volumes:
-      - ./config/heartbeat.yml:/usr/share/heartbeat/heartbeat.yml:ro,Z
+      - ./extensions/heartbeat/config/heartbeat.yml:/usr/share/heartbeat/heartbeat.yml:ro,Z
     environment:
       HEARTBEAT_INTERNAL_PASSWORD: ${HEARTBEAT_INTERNAL_PASSWORD:-}
       BEATS_SYSTEM_PASSWORD: ${BEATS_SYSTEM_PASSWORD:-}

diff --git a/extensions/logspout/logspout-compose.yml b/extensions/logspout/logspout-compose.yml
@@ -4,6 +4,7 @@ services:
   logspout:
     build:
       context: extensions/logspout
+    container_name: logspout
     volumes:
       - type: bind
         source: /var/run/docker.sock

diff --git a/extensions/metricbeat/config/metricbeat.yml b/extensions/metricbeat/config/metricbeat.yml
@@ -18,7 +18,7 @@ metricbeat.autodiscover:
 metricbeat.modules:
 - module: elasticsearch
   hosts: [ http://elasticsearch:9200 ]
-  username: monitoring_internal
+  username: elastic
   password: ${MONITORING_INTERNAL_PASSWORD}
   xpack.enabled: true
   period: 10s
@@ -30,7 +30,7 @@ metricbeat.modules:
   enabled: true
 - module: kibana
   hosts: [ http://kibana:5601 ]
-  username: monitoring_internal
+  username: elastic
   password: ${MONITORING_INTERNAL_PASSWORD}
   xpack.enabled: true
   period: 10s

diff --git a/extensions/metricbeat/metricbeat-compose.yml b/extensions/metricbeat/metricbeat-compose.yml
@@ -8,6 +8,7 @@ services:
         ELASTIC_VERSION: ${ELASTIC_VERSION}
     # Run as 'root' instead of 'metricbeat' (uid 1000) to allow reading
     # 'docker.sock' and the host's filesystem.
+    container_name: metricbeat
     user: root
     command:
       # Log to stderr.
@@ -20,7 +21,7 @@ services:
       # from within a container.
       - --system.hostfs=/hostfs
     volumes:
-      - ./config/metricbeat.yml:/usr/share/metricbeat/metricbeat.yml:ro,Z
+      - ./extensions/metricbeat/config/metricbeat.yml:/usr/share/metricbeat/metricbeat.yml:ro,Z
       - type: bind
         source: /
         target: /hostfs

diff --git a/host/YANLib.HttpApi.Host/YANLib.HttpApi.Host.csproj b/host/YANLib.HttpApi.Host/YANLib.HttpApi.Host.csproj
@@ -1,52 +1,51 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
-  <Import Project="..\..\common.props" />
+	<Import Project="..\..\common.props" />
 
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <RootNamespace>YANLib</RootNamespace>
-    <PreserveCompilationReferences>true</PreserveCompilationReferences>
-    <UserSecretsId>YANLib-4681b4fd-151f-4221-84a4-929d86723e4c</UserSecretsId>
-    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <DockerfileContext>..\..</DockerfileContext>
-    <DockerComposeProjectPath>..\..\docker-compose.dcproj</DockerComposeProjectPath>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFramework>net6.0</TargetFramework>
+		<RootNamespace>YANLib</RootNamespace>
+		<PreserveCompilationReferences>true</PreserveCompilationReferences>
+		<UserSecretsId>YANLib-4681b4fd-151f-4221-84a4-929d86723e4c</UserSecretsId>
+		<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
+		<DockerfileContext>..\..</DockerfileContext>
+		<DockerComposeProjectPath>..\..\docker-compose.dcproj</DockerComposeProjectPath>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Elastic.Apm" Version="1.22.0" />
-    <PackageReference Include="Elastic.Apm.NetCoreAll" Version="1.22.0" />
-    <PackageReference Include="Elastic.Apm.StackExchange.Redis" Version="1.22.0" />
-    <PackageReference Include="Serilog.AspNetCore" Version="6.1.0" />
-    <PackageReference Include="Serilog.Enrichers.Thread" Version="3.1.0" />
-    <PackageReference Include="Serilog.Expressions" Version="3.4.1" />
-    <PackageReference Include="Serilog.Formatting.Compact" Version="1.1.0" />
-    <PackageReference Include="Serilog.Settings.Configuration" Version="7.0.0" />
-    <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
-    <PackageReference Include="Serilog.Sinks.Elasticsearch" Version="9.0.1" />
-    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
-    <PackageReference Include="Volo.Abp.Autofac" Version="6.0.3" />
-    <PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="6.0.3" />
-    <PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="6.0.3" />
-    <PackageReference Include="Volo.Abp.Http.Client" Version="6.0.3" />
-    <PackageReference Include="Volo.Abp.Swashbuckle" Version="6.0.3" />
-  </ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="Elastic.Apm.NetCoreAll" Version="1.22.0" />
+		<PackageReference Include="Serilog.AspNetCore" Version="6.1.0" />
+		<PackageReference Include="Serilog.Enrichers.Thread" Version="3.1.0" />
+		<PackageReference Include="Serilog.Expressions" Version="3.4.1" />
+		<PackageReference Include="Serilog.Formatting.Compact" Version="1.1.0" />
+		<PackageReference Include="Serilog.Settings.Configuration" Version="7.0.0" />
+		<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
+		<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
+		<PackageReference Include="Serilog.Sinks.Elasticsearch" Version="9.0.1" />
+		<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
+		<PackageReference Include="Volo.Abp.Autofac" Version="6.0.3" />
+		<PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="6.0.3" />
+		<PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="6.0.3" />
+		<PackageReference Include="Volo.Abp.EntityFrameworkCore.SqlServer" Version="6.0.3" />
+		<PackageReference Include="Volo.Abp.Http.Client" Version="6.0.3" />
+		<PackageReference Include="Volo.Abp.Swashbuckle" Version="6.0.3" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="1.0.5" />
-  </ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="1.0.5" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <Compile Remove="Logs\**" />
-    <Content Remove="Logs\**" />
-    <EmbeddedResource Remove="Logs\**" />
-    <None Remove="Logs\**" />
-  </ItemGroup>
+	<ItemGroup>
+		<Compile Remove="Logs\**" />
+		<Content Remove="Logs\**" />
+		<EmbeddedResource Remove="Logs\**" />
+		<None Remove="Logs\**" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\YANLib.Application\YANLib.Application.csproj" />
-    <ProjectReference Include="..\..\src\YANLib.EntityFrameworkCore\YANLib.EntityFrameworkCore.csproj" />
-    <ProjectReference Include="..\..\src\YANLib.HttpApi\YANLib.HttpApi.csproj" />
-  </ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\..\src\YANLib.Application\YANLib.Application.csproj" />
+		<ProjectReference Include="..\..\src\YANLib.EntityFrameworkCore\YANLib.EntityFrameworkCore.csproj" />
+		<ProjectReference Include="..\..\src\YANLib.HttpApi\YANLib.HttpApi.csproj" />
+	</ItemGroup>
 
 </Project>
diff --git a/host/YANLib.HttpApi.Host/YANLibHttpApiHostModule.cs b/host/YANLib.HttpApi.Host/YANLibHttpApiHostModule.cs
@@ -19,11 +19,14 @@
 using Volo.Abp.AspNetCore.Serilog;
 using Volo.Abp.Autofac;
 using Volo.Abp.Caching.StackExchangeRedis;
+using Volo.Abp.EntityFrameworkCore;
+using Volo.Abp.EntityFrameworkCore.SqlServer;
 using Volo.Abp.Http.Client;
 using Volo.Abp.Localization;
 using Volo.Abp.Modularity;
 using Volo.Abp.Swashbuckle;
 using YANLib.EntityFrameworkCore;
+using YANLib.Utilities;
 using static Elastic.Apm.Agent;
 using static System.StringSplitOptions;
 
@@ -37,6 +40,7 @@ namespace YANLib;
     typeof(AbpAspNetCoreMvcUiLeptonXLiteThemeModule),
     typeof(AbpAspNetCoreSerilogModule),
     typeof(AbpSwashbuckleModule),
+    typeof(AbpEntityFrameworkCoreSqlServerModule),
     typeof(AbpCachingStackExchangeRedisModule),
     typeof(AbpHttpClientModule)
 )]
@@ -45,6 +49,8 @@ public class YANLibHttpApiHostModule : AbpModule
     public override void ConfigureServices(ServiceConfigurationContext context)
     {
         var configuration = context.Services.GetConfiguration();
+        context.Services.AddElasticsearch(configuration);
+        Configure<AbpDbContextOptions>(o => o.UseSqlServer());
         ConfigureConventionalControllers();
         ConfigureLocalization();
         ConfigureCors(context, configuration);