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

(demo): update grafana dashboards #902

Merged

Commits on Sep 28, 2023

  1. update grafana dashboards

    Signed-off-by: Pierre Tessier <pierre@pierretessier.com>
    puckpuck committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    42650d5 View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2023

  1. Merge remote-tracking branch 'upstream/main' into demo.grafana-dashbo…

    …ard-update
    
    # Conflicts:
    #	charts/opentelemetry-demo/Chart.yaml
    #	charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/component.yaml
    #	charts/opentelemetry-demo/examples/bring-your-own-observability/rendered/serviceaccount.yaml
    #	charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/component.yaml
    #	charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/grafana-dashboards.yaml
    #	charts/opentelemetry-demo/examples/collector-as-daemonset/rendered/serviceaccount.yaml
    #	charts/opentelemetry-demo/examples/custom-environment-variables/rendered/component.yaml
    #	charts/opentelemetry-demo/examples/custom-environment-variables/rendered/grafana-dashboards.yaml
    #	charts/opentelemetry-demo/examples/custom-environment-variables/rendered/serviceaccount.yaml
    #	charts/opentelemetry-demo/examples/default/rendered/component.yaml
    #	charts/opentelemetry-demo/examples/default/rendered/grafana-dashboards.yaml
    #	charts/opentelemetry-demo/examples/default/rendered/serviceaccount.yaml
    #	charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/component.yaml
    #	charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/grafana-dashboards.yaml
    #	charts/opentelemetry-demo/examples/public-hosted-ingress/rendered/serviceaccount.yaml
    puckpuck committed Sep 30, 2023
    Configuration menu
    Copy the full SHA
    0e1342d View commit details
    Browse the repository at this point in the history
  2. update grafana dashboards

    Signed-off-by: Pierre Tessier <pierre@pierretessier.com>
    puckpuck committed Sep 30, 2023
    Configuration menu
    Copy the full SHA
    c585fee View commit details
    Browse the repository at this point in the history