Skip to content

Commit

Permalink
Merge pull request #6 from Intellection/overhaul
Browse files Browse the repository at this point in the history
Perform an initial overhaul
  • Loading branch information
zacblazic authored Jan 29, 2018
2 parents eddcc15 + 3565ccf commit 01ea4ca
Show file tree
Hide file tree
Showing 12 changed files with 414 additions and 412 deletions.
4 changes: 1 addition & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
passenger_exporter
passenger_exporter_nginx
passenger_exporter_nginx-*.tar.gz
passenger-exporter
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Changelog

## 0.5.0

### Improvements
* Added home page with link to metrics.
* Added new fields to output parsed from passenger status command.
* Removed mentions of nginx as this exporter can support other integration modes.

### Breaking Changes
* Changed metrics prefix from `passenger_nginx` to `passenger`. This affects _all_ passenger metrics.
* Renamed metrics:
* Changed `passenger_top_level_queue` to `passenger_top_level_request_queue`.
* Changed `passenger_app_queue` to `passenger_app_request_queue`.
* Changed unit of passenger command timeout duration to seconds.
* Removed deprecated `code_revision` field from output parsed from passenger status command.
1 change: 1 addition & 0 deletions CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @itskingori @tsu-shiuan @zacblazic
5 changes: 2 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
VERSION := $(shell cat VERSION)
BIN := passenger_exporter_nginx
CONTAINER := passenger_exporter_nginx
BIN := passenger-exporter
CONTAINER := passenger-exporter
GOOS ?= linux
GOARCH ?= amd64

Expand All @@ -23,4 +23,3 @@ build-docker: $(BIN)

$(TAR): $(BIN)
tar czf $@ $<

71 changes: 0 additions & 71 deletions README

This file was deleted.

40 changes: 40 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# Passenger Exporter

Prometheus exporter for [Phusion Passenger](https://www.phusionpassenger.com) metrics.

## Flags

```
-log.format value
If set use a syslog logger or JSON logging.
Example: logger:syslog?appname=bob&local=7 or logger:stdout?json=true.
Defaults to stderr.
-log.level value
Only log messages with the given severity or above.
Valid levels: [debug, info, warn, error, fatal]. (default info)
-passenger.command string
Passenger command for querying passenger status.
(default "passenger-status --show=xml")
-passenger.pid-file string
Optional path to a file containing the passenger PID for additional metrics.
-passenger.command.timeout duration
Timeout for passenger.command. (default 500ms)
-web.listen-address string
Address to listen on for web interface and telemetry. (default ":9149")
-web.telemetry-path string
Path under which to expose metrics. (default "/metrics")
```


## Running Tests

Tests can be run with:
```
go test .
```

Additionally, the test/scrape_output.txt can be regenerated by passing the
`--golden` flag:
```
go test -v . --golden
```
Loading

0 comments on commit 01ea4ca

Please sign in to comment.