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

Change default Prometheus endpoint to /metrics #490

Merged
merged 1 commit into from
Apr 5, 2019
Merged

Change default Prometheus endpoint to /metrics #490

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 charts/promitor-scraper/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ azureAuthentication:
appKey: ""

scrapeConfig:
path: /prometheus/scrape
path: /metrics
timestamp: True

telemetry:
Expand Down
2 changes: 1 addition & 1 deletion docs/configuration/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion docs/deployment/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/Promitor.Core.Scraping/ScrapeEndpoint.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ namespace Promitor.Core.Scraping
{
public static class ScrapeEndpoint
{
private const string DefaultScrapeEndpoint = "/prometheus/scrape";
private const string DefaultScrapeEndpoint = "/metrics";

/// <summary>
/// Determines the base path under which the scrape endpoint is configured to be exposed
Expand Down