Skip to content

Commit

Permalink
webstore demo metric enhancement (#175)
Browse files Browse the repository at this point in the history
* add basic usage of grafana

Signed-off-by: Ziqi Zhao <zhaoziqi9146@gmail.com>

* add more config for grafana

Signed-off-by: Ziqi Zhao <zhaoziqi9146@gmail.com>

* fix for yamllint

Signed-off-by: Ziqi Zhao <zhaoziqi9146@gmail.com>

* fix for yamllint

Signed-off-by: Ziqi Zhao <zhaoziqi9146@gmail.com>

* fix for reviews

Signed-off-by: Ziqi Zhao <zhaoziqi9146@gmail.com>

Co-authored-by: Carter Socha <43380952+cartersocha@users.noreply.github.com>
  • Loading branch information
fatsheep9146 and cartersocha committed Jun 29, 2022
1 parent 7571792 commit f8db21d
Show file tree
Hide file tree
Showing 8 changed files with 2,752 additions and 1 deletion.
5 changes: 4 additions & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,7 @@ FEATURE_FLAG_SERVICE_PORT=50052
FEATURE_FLAG_GRPC_SERVICE_PORT=50053

# Prometheus
PROMETHEUS_SERVICE_PORT=9090
PROMETHEUS_SERVICE_PORT=9090

# Grafana
GRAFANA_SERVICE_PORT=3000
1 change: 1 addition & 0 deletions .github/.mlc_config.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"ignorePatterns": [
{"pattern": "^http://localhost:3000"},
{"pattern": "^http://localhost:8080"},
{"pattern": "^http://localhost:9090"},
{"pattern": "^http://localhost:16686"},
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ Once the images are built and containers are started you can access:

- Prometheus: <http://localhost:9090/>

- Grafana: <http://localhost:3000>

### Bring your own backend

Likely you want to use the Webstore as a demo application for an observability
Expand Down
10 changes: 10 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ services:
- "4317"
- "4318"
- "9464"
- "8888:8888"
depends_on:
- jaeger

Expand Down Expand Up @@ -271,3 +272,12 @@ services:
- ./src/prometheus/prometheus-config.yaml:/etc/prometheus/prometheus-config.yaml
ports:
- "${PROMETHEUS_SERVICE_PORT}:${PROMETHEUS_SERVICE_PORT}"

# Grafana
grafana:
image: grafana/grafana:9.0.1
volumes:
- ./src/grafana/grafana.ini:/etc/grafana/grafana.ini
- ./src/grafana/provisioning/:/etc/grafana/provisioning/
ports:
- "${GRAFANA_SERVICE_PORT}:${GRAFANA_SERVICE_PORT}"

0 comments on commit f8db21d

Please sign in to comment.