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.

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

Prometheus metrics #3171

Merged
merged 10 commits into from
Sep 13, 2017
Merged

Prometheus metrics #3171

merged 10 commits into from
Sep 13, 2017

Conversation

chelseakomlo
Copy link
Contributor

@chelseakomlo chelseakomlo commented Sep 7, 2017

This adds a Prometheus metrics sink and HTTP endpoint. The endpoint exposes metrics for Prometheus specifically as Prometheus only ingests data via protobuf or text format. See https://prometheus.io/docs/instrumenting/exposition_formats

@chelseakomlo chelseakomlo force-pushed the f-prometheus-metrics branch 5 times, most recently from 6f0c28e to 73b05df Compare September 8, 2017 18:44
@@ -661,6 +662,12 @@ func (c *Command) setupTelemetry(config *Config) (*metrics.InmemSink, error) {
fanout = append(fanout, sink)
}

// Configure the prometheus sink
promSink, err := prometheus.NewPrometheusSink()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@chelseakomlo chelseakomlo force-pushed the f-prometheus-metrics branch 2 times, most recently from 2f58a11 to ce97e92 Compare September 10, 2017 23:25
@chelseakomlo chelseakomlo force-pushed the f-prometheus-metrics branch 2 times, most recently from 6f5ab56 to 4f0aa33 Compare September 11, 2017 16:01
@chelseakomlo chelseakomlo changed the title WIP: prometheus metrics Prometheus metrics Sep 11, 2017
@@ -92,6 +92,7 @@ acl {
telemetry {
statsite_address = "127.0.0.1:1234"
statsd_address = "127.0.0.1:2345"
prometheus_metrics = true
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Formatting

@@ -114,6 +114,15 @@ telemetry {
}
```

### `prometheus`

These `telemetry` parameters apply to
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Collapse onto 1 line?


- `prometheus_metrics` `(bool: false)` - Specifies whether the agent should
initialize a PrometheusSink, where metrics will be reachable via the metrics
path `/v1/netrics?format=prometheus`.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

netrics -> metrics

[Prometheus](https://prometheus.io).

- `prometheus_metrics` `(bool: false)` - Specifies whether the agent should
initialize a PrometheusSink, where metrics will be reachable via the metrics
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Specifies whether the agent should make Prometheus formatted metrics available at /v1/metrics...

@dadgar
Copy link
Contributor

dadgar commented Sep 11, 2017

Changelog too

@chelseakomlo chelseakomlo force-pushed the f-prometheus-metrics branch 2 times, most recently from 57752f9 to 07fb30e Compare September 13, 2017 14:03
@chelseakomlo chelseakomlo merged commit 81fae05 into master Sep 13, 2017
@chelseakomlo chelseakomlo deleted the f-prometheus-metrics branch September 13, 2017 21:03
@github-actions
Copy link

I'm going to lock this pull request because it has been closed for 120 days ⏳. This helps our maintainers find and focus on the active contributions.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 23, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants