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.

Sign up for GitHub

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

Jump to bottom

webstore demo metric enhancement #175

Merged
merged 6 commits into from
Jun 29, 2022
Merged

webstore demo metric enhancement #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
96c84b9
add basic usage of grafana
fatsheep9146 Jun 28, 2022
9b2e3b8
add more config for grafana
fatsheep9146 Jun 28, 2022
b0dd290
fix for yamllint
fatsheep9146 Jun 28, 2022
8251ae6
fix for yamllint
fatsheep9146 Jun 28, 2022
8cbcb6d
Merge branch 'main' into demo-metric-enhancement
cartersocha Jun 28, 2022
0a156d3
fix for reviews
fatsheep9146 Jun 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .env
View file
Open in desktop
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

fatsheep9146 marked this conversation as resolved.
Show resolved Hide resolved
# Grafana
GRAFANA_SERVICE_PORT=3000
1 change: 1 addition & 0 deletions .github/.mlc_config.json
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
mic-max marked this conversation as resolved.
Show resolved Hide resolved
volumes:
- ./src/grafana/grafana.ini:/etc/grafana/grafana.ini
- ./src/grafana/provisioning/:/etc/grafana/provisioning/
ports:
- "${GRAFANA_SERVICE_PORT}:${GRAFANA_SERVICE_PORT}"
Loading