Skip to content

Commit

Permalink
1.4.1 Fix
Browse files Browse the repository at this point in the history
  • Loading branch information
pambrose authored Nov 15, 2019
1 parent 2d53ba3 commit e71d304
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ The only required argument is an Agent config value, which should have an `agent

| Options | Env Var | Property |Default | Description |
|:--------------------|:----------------|:-----------------------|:-------|:---------------------------------------|
| -c --config | PROXY_CONFIG | | | Agent config file or url |
| -c --config | PROXY_CONFIG | | | Agent config file or url |
| -p --port | PROXY_PORT | proxy.http.port | 8080 | Proxy listen port |
| -a --agent_port | AGENT_PORT | proxy.agent.port | 50051 | gRPC listen port for Agents |
| -r --admin | ADMIN_ENABLED | proxy.admin.enabled | false | Enable admin servlets |
Expand All @@ -167,7 +167,7 @@ The only required argument is an Agent config value, which should have an `agent

| Options | Env Var | Property |Default | Description |
|:--------------------|:----------------|:-----------------------|:-------|:---------------------------------------|
| -c --config | AGENT_CONFIG | | | Agent config file or url (required) |
| -c --config | AGENT_CONFIG | | | Agent config file or url (required) |
| -p --proxy | PROXY_HOSTNAME | agent.proxy.hostname | | Proxy hostname (can include :port) |
| -n --name | AGENT_NAME | agent.name | | Agent name |
| -r --admin | ADMIN_ENABLED | agent.admin.enabled | false | Enable admin servlets |
Expand Down
2 changes: 1 addition & 1 deletion etc/compose/proxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ prometheus-test:
#zipkin:
# image: 'openzipkin/zipkin'
# ports:
# - '9411:9411'
# - '9411:9411'

0 comments on commit e71d304

Please sign in to comment.