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.

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

[grafana] cleanup dashboards #2085

Merged
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ the release.
([#2070](https://github.com/open-telemetry/opentelemetry-demo/pull/2070))
* [frontend] Cypress tests base image updated to 14.0.3
([#2072](https://github.com/open-telemetry/opentelemetry-demo/pull/2072))
* [grafana] Update dashboards with service map
([#2085](https://github.com/open-telemetry/opentelemetry-demo/pull/2085))

## 2.0.0

Expand Down
1 change: 1 addition & 0 deletions docker-compose.minimal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -617,6 +617,7 @@ services:
- OTEL_COLLECTOR_HOST
- OTEL_COLLECTOR_PORT_GRPC
- OTEL_COLLECTOR_PORT_HTTP
- GOMEMLIMIT=160MiB

# Prometheus
prometheus:
Expand Down
1 change: 1 addition & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -763,6 +763,7 @@ services:
- OTEL_COLLECTOR_HOST
- OTEL_COLLECTOR_PORT_GRPC
- OTEL_COLLECTOR_PORT_HTTP
- GOMEMLIMIT=160MiB

# Prometheus
prometheus:
Expand Down
4 changes: 2 additions & 2 deletions src/grafana/grafana.ini
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ serve_from_sub_path = true
;default_theme = dark

# Path to a custom home page. Users are only redirected to this if the default home dashboard is used. It should match a frontend route and contain a leading slash.
; home_page =
home_page = /grafana/dashboards/f/demo/?orgId=1

# External user management, these options affect the organization users view
;external_manage_link_url =
Expand Down Expand Up @@ -436,7 +436,7 @@ disable_login_form = true
#################################### Anonymous Auth ######################
[auth.anonymous]
# enable anonymous access
enabled = true
enabled = true

# specify organization name that should be used for unauthenticated users
org_name = Main Org.
Expand Down
1 change: 1 addition & 0 deletions src/grafana/provisioning/dashboards/demo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ providers:
- name: 'OpenTelemetry Demo'
orgId: 1
folder: 'Demo'
folderUid: 'demo'
type: file
disableDeletion: false
editable: true
Expand Down
Loading