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

Jump to bottom

chore: Log Prometheus sink URL #1409

Merged
merged 1 commit into from
Dec 11, 2020
Merged

chore: Log Prometheus sink URL #1409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/Promitor.Agents.Core/AgentStartup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public class AgentStartup
/// Constructor
/// </summary>
/// <param name="configuration">Configuration of the application</param>
public AgentStartup(IConfiguration configuration)
protected AgentStartup(IConfiguration configuration)
{
Guard.NotNull(configuration, nameof(configuration));

Expand Down
3 changes: 2 additions & 1 deletion 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.

5 changes: 4 additions & 1 deletion src/Promitor.Agents.Scraper/Extensions/IApplicationBuilderExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using Microsoft.AspNetCore.Builder;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging;
using Prometheus.Client.AspNetCore;
using Promitor.Agents.Scraper.Configuration.Sinks;

Expand All @@ -14,13 +15,15 @@ public static class IApplicationBuilderExtensions
/// </summary>
/// <param name="app">Application Builder</param>
/// <param name="configuration">Configuration of the scraper agent</param>
public static IApplicationBuilder UseMetricSinks(this IApplicationBuilder app, IConfiguration configuration)
/// <param name="logger"></param>
public static IApplicationBuilder UseMetricSinks(this IApplicationBuilder app, IConfiguration configuration, ILogger<Startup> logger)
{
var metricSinkConfiguration = configuration.GetSection("metricSinks").Get<MetricSinkConfiguration>();
if (metricSinkConfiguration?.PrometheusScrapingEndpoint != null)
{
if (string.IsNullOrWhiteSpace(metricSinkConfiguration.PrometheusScrapingEndpoint.BaseUriPath) == false)
{
logger.LogInformation("Adding Prometheus sink to expose on {PrometheusUrl}", metricSinkConfiguration.PrometheusScrapingEndpoint.BaseUriPath);
app.UsePrometheusServer(prometheusOptions =>
{
prometheusOptions.MapPath = metricSinkConfiguration.PrometheusScrapingEndpoint.BaseUriPath;
Expand Down
7 changes: 4 additions & 3 deletions src/Promitor.Agents.Scraper/Startup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using Promitor.Agents.Core;
using Promitor.Agents.Scraper.Configuration;
using Promitor.Agents.Scraper.Configuration.Sinks;
Expand Down Expand Up @@ -54,7 +55,7 @@ public void ConfigureServices(IServiceCollection services)
}

// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILogger<Startup> logger)
{
if (env.IsDevelopment())
{
Expand All @@ -66,7 +67,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
.UseHttpCorrelation()
.UseVersionMiddleware()
.UseRouting()
.UseMetricSinks(Configuration)
.UseMetricSinks(Configuration, logger)
.ExposeOpenApiUi(ApiName)
.UseEndpoints(endpoints => endpoints.MapControllers());

Expand Down Expand Up @@ -99,7 +100,7 @@ private string BuildOpenApiDescription(IConfiguration configuration)
if (metricSinkConfiguration.PrometheusScrapingEndpoint != null)
{
var prometheusScrapingBaseUri = metricSinkConfiguration.PrometheusScrapingEndpoint.BaseUriPath;
openApiDescriptionBuilder.AppendLine($"<li>Prometheus scrape endpoint is exposed at <a href=\"./../..{prometheusScrapingBaseUri}\" target=\"_blank\">{prometheusScrapingBaseUri}</a></li>");
openApiDescriptionBuilder.AppendLine($"<li>Prometheus scrape endpoint is exposed at <a href=\"../{prometheusScrapingBaseUri}\" target=\"_blank\">{prometheusScrapingBaseUri}</a></li>");
}

if (metricSinkConfiguration.Statsd != null)
Expand Down