Skip to content

Commit

Permalink
Svelte Events Data Table #1477
Browse files Browse the repository at this point in the history
  • Loading branch information
niemyjski authored Jan 16, 2024
2 parents eefbb13 + 1381ba9 commit 9e10951
Show file tree
Hide file tree
Showing 94 changed files with 2,090 additions and 1,160 deletions.
4 changes: 2 additions & 2 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/devcontainers/dotnet:0-7.0
FROM mcr.microsoft.com/devcontainers/dotnet:0-8.0

RUN apt-get clean -y && rm -rf /var/lib/apt/lists/* /tmp/library-scripts

Expand All @@ -12,4 +12,4 @@ RUN sudo dotnet dev-certs https \
# Change shell to zsh
RUN chsh -s $(which zsh)

ENTRYPOINT [ "/bin/zsh" ]
ENTRYPOINT [ "/bin/zsh" ]
2 changes: 1 addition & 1 deletion .devcontainer/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ services:
- 5601:5601

redis:
image: redis:6-alpine
image: redis:7.2-alpine
ports:
- 6379:6379

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ ENTRYPOINT ["/app/docker-entrypoint.sh"]

# completely self-contained 7.x

FROM exceptionless/elasticsearch:7.17.14 AS exceptionless7
FROM exceptionless/elasticsearch:7.17.16 AS exceptionless7

WORKDIR /app
COPY --from=job-publish /app/src/Exceptionless.Job/out ./
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ Refer to the [Exceptionless documentation](https://exceptionless.com/docs/).
We provide very reasonably priced hosting at [Exceptionless](https://exceptionless.com). By using our hosted service, you are supporting the project and helping it get better! We also provide set up and support services.

Exceptionless can easily be run locally using Docker:

- `docker run --rm -it -p 5200:8080 exceptionless/exceptionless:latest`
- Open `http://localhost:5200`
- Create an account. The first account in the system will automatically be an admin.
Expand All @@ -25,12 +26,12 @@ This will run a completely self-contained simple instance of Exceptionless. It i

## Contributing

_In appreciation for anyone who submits a non-trivial pull request, we will give you a free [Exceptionless](https://exceptionless.com) paid plan for a year. After your pull request is accepted, simply send an email to team@exceptionless.io with the name of your organization and we will upgrade you to a paid plan._
_In appreciation for anyone who submits a non-trivial pull request, we will give you a free [Exceptionless](https://exceptionless.com) paid plan for a year. After your pull request is accepted, simply send an email to <team@exceptionless.io> with the name of your organization and we will upgrade you to a paid plan._

- Please read the [contributing document](https://github.com/exceptionless/Exceptionless/blob/main/CONTRIBUTING.md)
- Requirements
- [Docker](https://www.docker.com/get-docker)
- [.NET 7.0](https://dotnet.microsoft.com/)
- [.NET 8.0](https://dotnet.microsoft.com/)
- [Node 18+](https://nodejs.org/)
- Visual Studio Code
- Open Visual Studio Code and then open the Exceptionless root folder
Expand Down
2 changes: 1 addition & 1 deletion build/docker/elasticsearch/7.x/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# https://www.docker.elastic.co/
FROM docker.elastic.co/elasticsearch/elasticsearch:7.17.14
FROM docker.elastic.co/elasticsearch/elasticsearch:7.17.16

RUN elasticsearch-plugin install -b mapper-size
RUN elasticsearch-plugin install -b repository-azure
Expand Down
2 changes: 1 addition & 1 deletion build/docker/elasticsearch/8.x/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# https://www.docker.elastic.co/
FROM docker.elastic.co/elasticsearch/elasticsearch:8.11.1
FROM docker.elastic.co/elasticsearch/elasticsearch:8.11.3

RUN elasticsearch-plugin install -b mapper-size
RUN elasticsearch-plugin install -b repository-azure
Expand Down
4 changes: 2 additions & 2 deletions docker/docker-compose.7x.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: "2.2"

services:
elasticsearch:
image: exceptionless/elasticsearch:7.17.14
image: exceptionless/elasticsearch:7.17.16
environment:
discovery.type: single-node
xpack.security.enabled: "false"
Expand All @@ -16,7 +16,7 @@ services:
kibana:
depends_on:
- elasticsearch
image: docker.elastic.co/kibana/kibana:7.17.14
image: docker.elastic.co/kibana/kibana:7.17.16
ports:
- 5601:5601

Expand Down
10 changes: 5 additions & 5 deletions docker/docker-compose.apm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: "2.2"

services:
setup:
image: docker.elastic.co/elasticsearch/elasticsearch:8.11.1
image: docker.elastic.co/elasticsearch/elasticsearch:8.11.3
volumes:
- certs:/usr/share/elasticsearch/config/certs
user: "0"
Expand Down Expand Up @@ -53,7 +53,7 @@ services:
depends_on:
setup:
condition: service_healthy
image: docker.elastic.co/elasticsearch/elasticsearch:8.11.1
image: docker.elastic.co/elasticsearch/elasticsearch:8.11.3
volumes:
- certs:/usr/share/elasticsearch/config/certs
- esdata:/usr/share/elasticsearch/data
Expand Down Expand Up @@ -98,7 +98,7 @@ services:
depends_on:
elasticsearch:
condition: service_healthy
image: docker.elastic.co/kibana/kibana:8.11.1
image: docker.elastic.co/kibana/kibana:8.11.3
volumes:
- certs:/usr/share/kibana/config/certs
ports:
Expand All @@ -124,7 +124,7 @@ services:
depends_on:
elasticsearch:
condition: service_healthy
image: docker.elastic.co/apm/apm-server:8.11.1
image: docker.elastic.co/apm/apm-server:8.11.3
volumes:
- certs:/usr/share/apm-server/certs
ports:
Expand All @@ -149,7 +149,7 @@ services:
-E output.elasticsearch.ssl.certificate_authorities=["/usr/share/apm-server/certs/ca/ca.crt"]
redis:
image: redis:6-alpine
image: redis:7.2-alpine
ports:
- 6379:6379

Expand Down
6 changes: 3 additions & 3 deletions docker/docker-compose.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ services:
- appdata:/app/storage

elasticsearch:
image: exceptionless/elasticsearch:7.17.14
image: exceptionless/elasticsearch:8.11.3
environment:
discovery.type: single-node
xpack.security.enabled: "false"
Expand All @@ -64,12 +64,12 @@ services:
kibana:
depends_on:
- elasticsearch
image: docker.elastic.co/kibana/kibana:7.17.14
image: docker.elastic.co/kibana/kibana:8.11.3
ports:
- 5601:5601

redis:
image: redis:6.0-alpine
image: redis:7.2-alpine
ports:
- 6379:6379

Expand Down
6 changes: 3 additions & 3 deletions docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: "2.2"

services:
elasticsearch:
image: exceptionless/elasticsearch:8.11.1
image: exceptionless/elasticsearch:8.11.3
environment:
node.name: elasticsearch
cluster.name: exceptionless
Expand All @@ -18,14 +18,14 @@ services:
kibana:
depends_on:
- elasticsearch
image: docker.elastic.co/kibana/kibana:8.11.1
image: docker.elastic.co/kibana/kibana:8.11.3
environment:
xpack.security.enabled: "false"
ports:
- 5601:5601

redis:
image: redis:6-alpine
image: redis:7.2-alpine
ports:
- 6379:6379

Expand Down
2 changes: 1 addition & 1 deletion samples/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ services:
- 5601:5601

redis:
image: redis:6.0-alpine
image: redis:7.2-alpine
ports:
- 6379:6379

Expand Down
2 changes: 1 addition & 1 deletion src/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<ReferenceFoundatioSource>false</ReferenceFoundatioSource>
<ReferenceFoundatioRepositoriesSource>false</ReferenceFoundatioRepositoriesSource>
<FoundatioVersion>10.6.1</FoundatioVersion>
<FoundatioVersion>10.7.0</FoundatioVersion>
<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
</PropertyGroup>

Expand Down
10 changes: 5 additions & 5 deletions src/Exceptionless.Core/Exceptionless.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,20 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="AutoMapper" Version="12.0.1" />
<PackageReference Include="FluentValidation" Version="11.8.1" />
<PackageReference Include="FluentValidation" Version="11.9.0" />
<PackageReference Include="Foundatio.Extensions.Hosting" Version="$(FoundatioVersion)" />
<PackageReference Include="Foundatio.JsonNet" Version="$(FoundatioVersion)" />
<PackageReference Include="NEST.JsonNetSerializer" Version="7.17.5" />
<PackageReference Include="Handlebars.Net" Version="2.1.4" />
<PackageReference Include="McSherry.SemanticVersioning" Version="1.4.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
<PackageReference Include="Stripe.net" Version="43.7.0" />
<PackageReference Include="Stripe.net" Version="43.10.0" />
<PackageReference Include="System.DirectoryServices" Version="8.0.0" />
<PackageReference Include="UAParser" Version="3.1.47" />

<PackageReference Include="Foundatio.Repositories.Elasticsearch" Version="7.17.6" Condition="'$(ReferenceFoundatioRepositoriesSource)' == '' OR '$(ReferenceFoundatioRepositoriesSource)' == 'false'" />
<PackageReference Include="Foundatio.Repositories.Elasticsearch" Version="7.17.7" Condition="'$(ReferenceFoundatioRepositoriesSource)' == '' OR '$(ReferenceFoundatioRepositoriesSource)' == 'false'" />
<ProjectReference Include="..\..\..\..\Foundatio\Foundatio.Repositories\src\Foundatio.Repositories.Elasticsearch\Foundatio.Repositories.Elasticsearch.csproj" Condition="'$(ReferenceFoundatioRepositoriesSource)' == 'true'" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public override SlackMessage GetSlackEventNotification(PersistentEvent ev, Proje
string subject = $"[{project.Name}] A {notificationType}: *{GetSlackEventUrl(ev.Id, messageOrSource.Truncate(120))}*";
return new SlackMessage(subject)
{
Attachments = new List<SlackMessage.SlackAttachment> { attachment }
Attachments = [attachment]
};
}
}
12 changes: 6 additions & 6 deletions src/Exceptionless.Insulation/Bootstrapper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public static void RegisterServices(IServiceCollection services, AppOptions appO
RegisterQueue(services, appOptions.QueueOptions, runMaintenanceTasks);
RegisterStorage(services, appOptions.StorageOptions);

var healthCheckBuilder = RegisterHealthChecks(services, appOptions);
var healthCheckBuilder = RegisterHealthChecks(services);

if (!String.IsNullOrEmpty(appOptions.EmailOptions.SmtpHost))
{
Expand All @@ -75,7 +75,7 @@ public static void RegisterServices(IServiceCollection services, AppOptions appO
}
}

private static IHealthChecksBuilder RegisterHealthChecks(IServiceCollection services, AppOptions appOptions)
private static IHealthChecksBuilder RegisterHealthChecks(IServiceCollection services)
{
services.AddStartupActionToWaitForHealthChecks("Critical");

Expand Down Expand Up @@ -106,7 +106,7 @@ private static void RegisterCache(IServiceCollection container, CacheOptions opt
{
if (String.Equals(options.Provider, "redis"))
{
container.ReplaceSingleton(s => GetRedisConnection(options.Data));
container.ReplaceSingleton(s => GetRedisConnection(options.Data, s.GetRequiredService<ILoggerFactory>()));

if (!String.IsNullOrEmpty(options.Scope))
container.ReplaceSingleton<ICacheClient>(s => new ScopedCacheClient(CreateRedisCacheClient(s), options.Scope));
Expand All @@ -121,7 +121,7 @@ private static void RegisterMessageBus(IServiceCollection container, MessageBusO
{
if (String.Equals(options.Provider, "redis"))
{
container.ReplaceSingleton(s => GetRedisConnection(options.Data));
container.ReplaceSingleton(s => GetRedisConnection(options.Data, s.GetRequiredService<ILoggerFactory>()));

container.ReplaceSingleton<IMessageBus>(s => new RedisMessageBus(new RedisMessageBusOptions
{
Expand All @@ -143,9 +143,9 @@ private static void RegisterMessageBus(IServiceCollection container, MessageBusO
}
}

private static IConnectionMultiplexer GetRedisConnection(Dictionary<string, string> options)
private static IConnectionMultiplexer GetRedisConnection(Dictionary<string, string> options, ILoggerFactory loggerFactory)
{
return ConnectionMultiplexer.Connect(options.GetString("server"));
return ConnectionMultiplexer.Connect(options.GetString("server"), o => o.LoggerFactory = loggerFactory);
}

private static void RegisterQueue(IServiceCollection container, QueueOptions options, bool runMaintenanceTasks)
Expand Down
12 changes: 6 additions & 6 deletions src/Exceptionless.Insulation/Exceptionless.Insulation.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
<ItemGroup>
<PackageReference Include="Geocoding.Google" Version="4.0.1" />
<PackageReference Include="MaxMind.GeoIP2" Version="5.2.0" />
<PackageReference Include="Foundatio.Aliyun" Version="10.6.1" />
<PackageReference Include="Foundatio.AWS" Version="10.6.1" />
<PackageReference Include="Foundatio.AzureStorage" Version="10.6.1" />
<PackageReference Include="Foundatio.Aliyun" Version="10.7.0" />
<PackageReference Include="Foundatio.AWS" Version="10.7.0" />
<PackageReference Include="Foundatio.AzureStorage" Version="10.7.0" />
<PackageReference Include="Foundatio.Extensions.Hosting" Version="$(FoundatioVersion)" />
<PackageReference Include="Foundatio.Minio" Version="10.6.1" />
<PackageReference Include="Foundatio.RabbitMQ" Version="10.6.1" />
<PackageReference Include="Foundatio.Redis" Version="10.6.1" />
<PackageReference Include="Foundatio.Minio" Version="10.7.0" />
<PackageReference Include="Foundatio.RabbitMQ" Version="10.7.0" />
<PackageReference Include="Foundatio.Redis" Version="10.7.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
Expand Down
4 changes: 2 additions & 2 deletions src/Exceptionless.Insulation/Geo/MaxMindGeoIpService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public MaxMindGeoIpService(IFileStorage storage, ILoggerFactory loggerFactory)

public async Task<GeoResult?> ResolveIpAsync(string ip, CancellationToken cancellationToken = new())
{
if (String.IsNullOrEmpty(ip) || (!ip.Contains(".") && !ip.Contains(":")))
if (String.IsNullOrEmpty(ip) || (!ip.Contains('.') && !ip.Contains(':')))
return null;

ip = ip.Trim();
Expand Down Expand Up @@ -103,7 +103,7 @@ public MaxMindGeoIpService(IFileStorage storage, ILoggerFactory loggerFactory)
_logger.LogInformation("Loading GeoIP database.");
try
{
using (var stream = await _storage.GetFileStreamAsync(DownloadGeoIPDatabaseJob.GEO_IP_DATABASE_PATH, cancellationToken).AnyContext())
using (var stream = await _storage.GetFileStreamAsync(DownloadGeoIPDatabaseJob.GEO_IP_DATABASE_PATH, StreamMode.Read, cancellationToken).AnyContext())
_database = new DatabaseReader(stream);
}
catch (Exception ex)
Expand Down
6 changes: 3 additions & 3 deletions src/Exceptionless.Job/Exceptionless.Job.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<ItemGroup>
<PackageReference Include="Exceptionless.AspNetCore" Version="6.0.3" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.1" />
<PackageReference Include="App.Metrics.AspNetCore" Version="4.3.0" />
<PackageReference Include="Serilog.AspNetCore" Version="8.0.0" />
<PackageReference Include="Serilog.Enrichers.Span" Version="3.1.0" />
Expand All @@ -17,9 +17,9 @@
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.7.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.7.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.7.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.StackExchangeRedis" Version="1.0.0-rc9.12" />
<PackageReference Include="OpenTelemetry.Instrumentation.StackExchangeRedis" Version="1.0.0-rc9.13" />
<PackageReference Include="OpenTelemetry.Instrumentation.ElasticsearchClient" Version="1.0.0-beta.5" />
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.5.1" />
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.7.0" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 3 additions & 1 deletion src/Exceptionless.Web/ClientApp/.vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
"bradlc.vscode-tailwindcss",
"digitalbrainstem.javascript-ejs-support",
"dbaeumer.vscode-eslint",
"esbenp.prettier-vscode"
"esbenp.prettier-vscode",
"selemondev.vscode-shadcn-svelte",
"zixuanchen.vitest-explorer"
]
}
1 change: 0 additions & 1 deletion src/Exceptionless.Web/ClientApp/.vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
"satellizer",
"sessionend",
"shadcn",
"svoast",
"tailwindcss",
"tanstack"
],
Expand Down
Loading

0 comments on commit 9e10951

Please sign in to comment.