Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): update prometheus.client #2136

Merged
merged 5 commits into from
Oct 5, 2022
Merged

chore(deps): update prometheus.client #2136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
25e7e57
chore(deps): update prometheus.client (#1772)
phnx47 Sep 28, 2022
51fbbb6
fix: use DefaultCollectorRegistry (#1772)
phnx47 Sep 28, 2022
dc2a6f4
Merge branch 'master' into update-prom-client
phnx47 Oct 4, 2022
fcfe5d7
Merge branch 'master' into update-prom-client
tomkerkhove Oct 5, 2022
1a402c1
fix: add legacy default metrics
phnx47 Oct 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/Promitor.Agents.Core/Extensions/IApplicationBuilderExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ public static IApplicationBuilder UsePrometheusMetrics(this IApplicationBuilder
prometheusOptions.MapPath = baseUriPath;
prometheusOptions.UseDefaultCollectors = true;
prometheusOptions.MetricPrefixName = "promitor_runtime_";
#pragma warning disable CS0618
prometheusOptions.AddLegacyMetrics = true;
#pragma warning restore CS0618
});

return app;
Expand Down
6 changes: 3 additions & 3 deletions src/Promitor.Agents.Core/Promitor.Agents.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
<PackageReference Include="Microsoft.AspNetCore.Mvc.Formatters.Json" Version="2.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.9" />
<PackageReference Include="NetEscapades.Configuration.Yaml" Version="2.2.0" />
<PackageReference Include="Prometheus.Client.AspNetCore" Version="4.6.0" />
<PackageReference Include="Prometheus.Client.DependencyInjection" Version="0.4.0" />
<PackageReference Include="Prometheus.Client.HttpRequestDurations" Version="3.5.0" />
<PackageReference Include="Prometheus.Client" Version="5.1.0" />
<PackageReference Include="Prometheus.Client.AspNetCore" Version="4.8.0" />
<PackageReference Include="Prometheus.Client.HttpRequestDurations" Version="3.6.0" />
<PackageReference Include="Serilog.AspNetCore" Version="6.0.1" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
<PackageReference Include="Spectre.Console" Version="0.45.0" />
Expand Down
2 changes: 1 addition & 1 deletion src/Promitor.Agents.ResourceDiscovery/Docs/Open-Api.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/Promitor.Agents.Scraper/Docs/Open-Api.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion src/Promitor.Core/Promitor.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
<PackageReference Include="Microsoft.Azure.Management.Monitor.Fluent" Version="1.38.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.2" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
<PackageReference Include="Prometheus.Client" Version="4.5.3" />
<PackageReference Include="YamlDotNet" Version="12.0.1" />
</ItemGroup>

Expand Down
5 changes: 3 additions & 2 deletions src/Promitor.Integrations.Sinks.Prometheus/Extensions/IServiceCollectionExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using Microsoft.Extensions.DependencyInjection;
using Prometheus.Client;
using Prometheus.Client.DependencyInjection;
using Promitor.Core.Metrics.Interfaces;
using Promitor.Integrations.Sinks.Prometheus.Collectors;
Expand All @@ -13,10 +14,10 @@ public static class IServiceCollectionExtensions
/// </summary>
public static IServiceCollection AddPrometheusSystemMetrics(this IServiceCollection services)
{
services.AddMetricFactory();
services.AddMetricFactory(Metrics.DefaultCollectorRegistry);
services.AddTransient<ISystemMetricsSink, PrometheusSystemMetricsSink>();

return services;
}
}
}
}
2 changes: 1 addition & 1 deletion src/Promitor.Integrations.Sinks.Prometheus/Promitor.Integrations.Sinks.Prometheus.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Prometheus.Client" Version="4.5.3" />
<PackageReference Include="Prometheus.Client.DependencyInjection" Version="1.2.1" />
</ItemGroup>

<ItemGroup>
Expand Down