diff --git a/charts/promitor-scraper/values.yaml b/charts/promitor-scraper/values.yaml index f0104704a..95450185d 100644 --- a/charts/promitor-scraper/values.yaml +++ b/charts/promitor-scraper/values.yaml @@ -13,7 +13,7 @@ azureAuthentication: appKey: "" scrapeConfig: - path: /prometheus/scrape + path: /metrics timestamp: True telemetry: diff --git a/docs/configuration/index.md b/docs/configuration/index.md index ad4239a7e..7c90ea8f9 100644 --- a/docs/configuration/index.md +++ b/docs/configuration/index.md @@ -14,7 +14,7 @@ Promitor automatically scrapes Azure Monitor and makes the information available The behavior of this can be configured with the following environment variables: - **PROMITOR_CONFIGURATION_PATH** - Defines the location of the YAML file that declares what Azure Monitor metrics to scrape. If nothing is specified, `/config/metrics-declaration.yaml` will be used. -- **PROMITOR_SCRAPE_BASEPATH** - Controls the path where the scraping endpoint for Prometheus is being exposed. If nothing is specified, `/prometheus/scrape` will be used. +- **PROMITOR_SCRAPE_BASEPATH** - Controls the path where the scraping endpoint for Prometheus is being exposed. If nothing is specified, `/metrics` will be used. We're also providing feature flags to opt-out of certain features: - **PROMITOR_FEATURE_METRICSTIMESTAMP** - Defines whether or not a timestamp should be included when the value was scraped on Azure Monitor. Supported values are `True` to opt-in & `False` to opt-out, if nothing is configured this will be turned on. diff --git a/docs/deployment/index.md b/docs/deployment/index.md index 21deadd87..5414e9fa0 100644 --- a/docs/deployment/index.md +++ b/docs/deployment/index.md @@ -31,7 +31,7 @@ azureAuthentication: scrapeConfig: # PROMITOR_SCRAPE_BASEPATH (Optional, default is shown) - path: /prometheus/scrape + path: /metrics # PROMITOR_FEATURE_METRICSTIMESTAMP (Optional, default is shown) timestamp: True diff --git a/src/Promitor.Core.Scraping/ScrapeEndpoint.cs b/src/Promitor.Core.Scraping/ScrapeEndpoint.cs index d281205b1..d336de94b 100644 --- a/src/Promitor.Core.Scraping/ScrapeEndpoint.cs +++ b/src/Promitor.Core.Scraping/ScrapeEndpoint.cs @@ -5,7 +5,7 @@ namespace Promitor.Core.Scraping { public static class ScrapeEndpoint { - private const string DefaultScrapeEndpoint = "/prometheus/scrape"; + private const string DefaultScrapeEndpoint = "/metrics"; /// /// Determines the base path under which the scrape endpoint is configured to be exposed