Skip to content

Commit 01ea4ca

Browse files
authored
Merge pull request #6 from Intellection/overhaul
Perform an initial overhaul
2 parents eddcc15 + 3565ccf commit 01ea4ca

12 files changed

Lines changed: 414 additions & 412 deletions

.gitignore

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
passenger_exporter
2-
passenger_exporter_nginx
3-
passenger_exporter_nginx-*.tar.gz
1+
passenger-exporter

CHANGELOG.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# Changelog
2+
3+
## 0.5.0
4+
5+
### Improvements
6+
* Added home page with link to metrics.
7+
* Added new fields to output parsed from passenger status command.
8+
* Removed mentions of nginx as this exporter can support other integration modes.
9+
10+
### Breaking Changes
11+
* Changed metrics prefix from `passenger_nginx` to `passenger`. This affects _all_ passenger metrics.
12+
* Renamed metrics:
13+
* Changed `passenger_top_level_queue` to `passenger_top_level_request_queue`.
14+
* Changed `passenger_app_queue` to `passenger_app_request_queue`.
15+
* Changed unit of passenger command timeout duration to seconds.
16+
* Removed deprecated `code_revision` field from output parsed from passenger status command.

CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @itskingori @tsu-shiuan @zacblazic

Makefile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
VERSION := $(shell cat VERSION)
2-
BIN := passenger_exporter_nginx
3-
CONTAINER := passenger_exporter_nginx
2+
BIN := passenger-exporter
3+
CONTAINER := passenger-exporter
44
GOOS ?= linux
55
GOARCH ?= amd64
66

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

2424
$(TAR): $(BIN)
2525
tar czf $@ $<
26-

README

Lines changed: 0 additions & 71 deletions
This file was deleted.

README.md

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
# Passenger Exporter
2+
3+
Prometheus exporter for [Phusion Passenger](https://www.phusionpassenger.com) metrics.
4+
5+
## Flags
6+
7+
```
8+
-log.format value
9+
If set use a syslog logger or JSON logging.
10+
Example: logger:syslog?appname=bob&local=7 or logger:stdout?json=true.
11+
Defaults to stderr.
12+
-log.level value
13+
Only log messages with the given severity or above.
14+
Valid levels: [debug, info, warn, error, fatal]. (default info)
15+
-passenger.command string
16+
Passenger command for querying passenger status.
17+
(default "passenger-status --show=xml")
18+
-passenger.pid-file string
19+
Optional path to a file containing the passenger PID for additional metrics.
20+
-passenger.command.timeout duration
21+
Timeout for passenger.command. (default 500ms)
22+
-web.listen-address string
23+
Address to listen on for web interface and telemetry. (default ":9149")
24+
-web.telemetry-path string
25+
Path under which to expose metrics. (default "/metrics")
26+
```
27+
28+
29+
## Running Tests
30+
31+
Tests can be run with:
32+
```
33+
go test .
34+
```
35+
36+
Additionally, the test/scrape_output.txt can be regenerated by passing the
37+
`--golden` flag:
38+
```
39+
go test -v . --golden
40+
```

0 commit comments

Comments
 (0)