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

[demo] add grafana and prometheus #456

Merged
merged 18 commits into from
Nov 3, 2022
Merged

[demo] add grafana and prometheus #456

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
ba61c6f
add grafana and prometheus
puckpuck Oct 21, 2022
f5ec882
add grafana and prometheus
puckpuck Oct 21, 2022
7aad631
add grafana and prometheus chart repos
puckpuck Oct 21, 2022
6b76823
fix linter
puckpuck Oct 21, 2022
7a93cb7
Merge branch 'main' into demo.add-prometheus-grafana
puckpuck Oct 21, 2022
f85689c
use configmap for dashboard
puckpuck Oct 21, 2022
95d4e3d
update dependencies
puckpuck Oct 21, 2022
7f61ae4
fix spelling mistake
puckpuck Oct 21, 2022
b8c5075
Merge branch 'main' into demo.add-prometheus-grafana
puckpuck Nov 2, 2022
15d6355
remove duplicate default values
puckpuck Nov 2, 2022
1bd1254
add demo dashboard
puckpuck Nov 2, 2022
a68f47d
update versions
puckpuck Nov 2, 2022
ee2803b
update examples
puckpuck Nov 2, 2022
49e17ac
keep processors for spanmetrics
puckpuck Nov 2, 2022
5fc2db3
remove sub-chart default overrides
puckpuck Nov 2, 2022
5ddab58
Merge remote-tracking branch 'upstream/main' into demo.add-prometheus…
puckpuck Nov 2, 2022
d5e7bf2
generate-examples
puckpuck Nov 3, 2022
5037411
simplify spanmetrics config
puckpuck Nov 3, 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
4 changes: 2 additions & 2 deletions .github/workflows/demo-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Test Demo Chart

on:
pull_request:
paths:
paths:
- 'charts/opentelemetry-demo/**'
branches:
- main
Expand All @@ -21,4 +21,4 @@ jobs:
create-kind-cluster: "true"

- name: Run chart-testing (install)
run: ct install --charts charts/opentelemetry-demo --chart-repos opentelemetry-collector=https://open-telemetry.github.io/opentelemetry-helm-charts
run: ct install --charts charts/opentelemetry-demo --chart-repos opentelemetry-collector=https://open-telemetry.github.io/opentelemetry-helm-charts,prometheus=https://prometheus-community.github.io/helm-charts,grafana=https://grafana.github.io/helm-charts
2 changes: 1 addition & 1 deletion .github/workflows/lint.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
create-kind-cluster: "false"

- name: Run chart-testing (lint)
run: ct lint --target-branch main --chart-repos opentelemetry-collector=https://open-telemetry.github.io/opentelemetry-helm-charts
run: ct lint --target-branch main --chart-repos opentelemetry-collector=https://open-telemetry.github.io/opentelemetry-helm-charts,prometheus=https://prometheus-community.github.io/helm-charts,grafana=https://grafana.github.io/helm-charts

- name: Run make check-examples
run: make check-examples
12 changes: 9 additions & 3 deletions charts/opentelemetry-demo/Chart.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
dependencies:
- name: opentelemetry-collector
repository: https://open-telemetry.github.io/opentelemetry-helm-charts
version: 0.35.0
digest: sha256:bdb9017facd947da7979b0090e469575c6831e453ec90ea0768f5371cb1c92ec
generated: "2022-10-03T09:53:03.790673-06:00"
version: 0.38.0
- name: prometheus
repository: https://prometheus-community.github.io/helm-charts
version: 15.16.1
- name: grafana
repository: https://grafana.github.io/helm-charts
version: 6.42.2
digest: sha256:a053cc4c963d0e1e305a9719832073e000adfd2eccec3107e921067414e68c8a
generated: "2022-11-01T22:54:12.017808-04:00"
14 changes: 11 additions & 3 deletions charts/opentelemetry-demo/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
type: application
name: opentelemetry-demo
version: 0.9.6
version: 0.10.0
description: opentelemetry demo helm chart
home: https://opentelemetry.io/
sources:
Expand All @@ -11,9 +11,17 @@ maintainers:
- name: tylerhelmuth
- name: wph95
icon: https://opentelemetry.io/img/logos/opentelemetry-logo-nav.png
appVersion: "0.6.1-beta"
appVersion: "1.0.0"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we take the 1.0 images in this PR without the frontendproxy stuff?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. The frontend proxy is an additional layer to help for browser-initiated tracing span data, which is a separate thing. We also use it to limit the exposed ports. All that is part of the next PR.

dependencies:
- name: opentelemetry-collector
version: 0.35.0
version: 0.38.0
repository: https://open-telemetry.github.io/opentelemetry-helm-charts
condition: observability.otelcol.enabled
- name: prometheus
version: 15.16.1
repository: https://prometheus-community.github.io/helm-charts
condition: observability.prometheus.enabled
- name: grafana
version: 6.42.2
repository: https://grafana.github.io/helm-charts
condition: observability.grafana.enabled
Loading