Skip to content

[demo] add grafana and prometheus #456

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

Merged
merged 18 commits into from
Nov 3, 2022
Merged

[demo] add grafana and prometheus #456

Changes from 1 commit
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
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'upstream/main' into demo.add-prometheus… 
…-grafana

# Conflicts:
#	charts/opentelemetry-demo/Chart.yaml
#	charts/opentelemetry-demo/examples/default/rendered/component.yaml
#	charts/opentelemetry-demo/examples/default/rendered/jaeger.yaml
  • Loading branch information
@puckpuck
puckpuck committed Nov 2, 2022
commit 5ddab5841083150b702c1a393ab977a833bc9e16

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.