Ensure Prometheus metric sink does write timestamps (#1217)

Signed-off-by: Tom Kerkhove <[email protected]>
tomkerkhove · Aug 14, 2020 · 7167027 · 7167027
1 parent 5261ebb
commit 7167027
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/changelog/content/experimental/unreleased.md b/changelog/content/experimental/unreleased.md
@@ -24,6 +24,7 @@ version:
  queue name. [#529](https://github.com/tomkerkhove/promitor/issues/529).
 - {{% tag changed %}} Handle validation failures on startup more gracefully. [#1113](https://github.com/tomkerkhove/promitor/issues/1113).
 - {{% tag changed %}} Improve time series handling to ensure finalized time series are reported
+- {{% tag fixed %}} Ensure Prometheus metric sink does write timestamps [#1217](https://github.com/tomkerkhove/promitor/issues/1217).
 - {{% tag removed %}} Support for Prometheus legacy configuration ([deprecation notice](https://changelog.promitor.io/#prometheus-legacy-configuration)
  | [migration guide](https://promitor.io/walkthrough/migrate-from-1.x-to-2.x))
 - {{% tag removed %}} Support for Swagger UI 2.0 ([deprecation notice](https://changelog.promitor.io/#swagger-ui-2-0) |

diff --git a/config/promitor/scraper/runtime.yaml b/config/promitor/scraper/runtime.yaml
@@ -2,9 +2,9 @@ server:
   httpPort: 88
 metricSinks:
   prometheusScrapingEndpoint:
-    metricUnavailableValue: NaN
+    metricUnavailableValue: -1
     enableMetricTimestamps: true # true by default
-    baseUriPath: /metrics
+    baseUriPath: /scrape
   statsd:
     host: graphite
     port: 8125

diff --git a/src/Promitor.Agents.Scraper/Extensions/IServiceCollectionExtensions.cs b/src/Promitor.Agents.Scraper/Extensions/IServiceCollectionExtensions.cs
@@ -155,7 +155,7 @@ public static IServiceCollection ConfigureYamlConfiguration(this IServiceCollect
             services.Configure<ResourceDiscoveryConfiguration>(configuration.GetSection("resourceDiscovery"));
             services.Configure<TelemetryConfiguration>(configuration.GetSection("telemetry"));
             services.Configure<ServerConfiguration>(configuration.GetSection("server"));
-            services.Configure<PrometheusScrapingEndpointSinkConfiguration>(configuration.GetSection("metricSinks:prometheus"));
+            services.Configure<PrometheusScrapingEndpointSinkConfiguration>(configuration.GetSection("metricSinks:prometheusScrapingEndpoint"));
             services.Configure<StatsdSinkConfiguration>(configuration.GetSection("metricSinks:statsd"));
             services.Configure<AtlassianStatusPageSinkConfiguration>(configuration.GetSection("metricSinks:atlassianStatuspage"));
             services.Configure<ApplicationInsightsConfiguration>(configuration.GetSection("telemetry:applicationInsights"));