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] add grafana and prometheus #456

Merged
merged 18 commits into from
Nov 3, 2022
Merged
Show file tree
Hide file tree
Changes from 8 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
4 changes: 2 additions & 2 deletions .github/workflows/demo-test.yaml
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
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
10 changes: 8 additions & 2 deletions charts/opentelemetry-demo/Chart.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,11 @@ 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"
- 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:000467dc27e083a789ddaced305e6a7d96750eb3837c080e76a1d8172deac74a
generated: "2022-10-21T17:33:45.02792-04:00"
10 changes: 9 additions & 1 deletion charts/opentelemetry-demo/Chart.yaml
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 @@ -17,3 +17,11 @@ dependencies:
version: 0.35.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
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ kind: Service
metadata:
name: example-adservice
labels:
helm.sh/chart: opentelemetry-demo-0.9.6
helm.sh/chart: opentelemetry-demo-0.10.0
app.kubernetes.io/name: example
app.kubernetes.io/instance: example
app.kubernetes.io/component: adservice
Expand All @@ -28,7 +28,7 @@ kind: Service
metadata:
name: example-cartservice
labels:
helm.sh/chart: opentelemetry-demo-0.9.6
helm.sh/chart: opentelemetry-demo-0.10.0
app.kubernetes.io/name: example
app.kubernetes.io/instance: example
app.kubernetes.io/component: cartservice
Expand All @@ -51,7 +51,7 @@ kind: Service
metadata:
name: example-checkoutservice
labels:
helm.sh/chart: opentelemetry-demo-0.9.6
helm.sh/chart: opentelemetry-demo-0.10.0
app.kubernetes.io/name: example
app.kubernetes.io/instance: example
app.kubernetes.io/component: checkoutservice
Expand All @@ -74,7 +74,7 @@ kind: Service
metadata:
name: example-currencyservice
labels:
helm.sh/chart: opentelemetry-demo-0.9.6
helm.sh/chart: opentelemetry-demo-0.10.0
app.kubernetes.io/name: example
app.kubernetes.io/instance: example
app.kubernetes.io/component: currencyservice
Expand All @@ -97,7 +97,7 @@ kind: Service
metadata:
name: example-emailservice
labels:
helm.sh/chart: opentelemetry-demo-0.9.6
helm.sh/chart: opentelemetry-demo-0.10.0
app.kubernetes.io/name: example
app.kubernetes.io/instance: example
app.kubernetes.io/component: emailservice
Expand All @@ -120,7 +120,7 @@ kind: Service
metadata:
name: example-featureflagservice
labels:
helm.sh/chart: opentelemetry-demo-0.9.6
helm.sh/chart: opentelemetry-demo-0.10.0
app.kubernetes.io/name: example
app.kubernetes.io/instance: example
app.kubernetes.io/component: featureflagservice
Expand All @@ -146,7 +146,7 @@ kind: Service
metadata:
name: example-ffspostgres
labels:
helm.sh/chart: opentelemetry-demo-0.9.6
helm.sh/chart: opentelemetry-demo-0.10.0
app.kubernetes.io/name: example
app.kubernetes.io/instance: example
app.kubernetes.io/component: ffspostgres
Expand All @@ -169,7 +169,7 @@ kind: Service
metadata:
name: example-frontend
labels:
helm.sh/chart: opentelemetry-demo-0.9.6
helm.sh/chart: opentelemetry-demo-0.10.0
app.kubernetes.io/name: example
app.kubernetes.io/instance: example
app.kubernetes.io/component: frontend
Expand All @@ -192,7 +192,7 @@ kind: Service
metadata:
name: example-loadgenerator
labels:
helm.sh/chart: opentelemetry-demo-0.9.6
helm.sh/chart: opentelemetry-demo-0.10.0
app.kubernetes.io/name: example
app.kubernetes.io/instance: example
app.kubernetes.io/component: loadgenerator
Expand All @@ -215,7 +215,7 @@ kind: Service
metadata:
name: example-paymentservice
labels:
helm.sh/chart: opentelemetry-demo-0.9.6
helm.sh/chart: opentelemetry-demo-0.10.0
app.kubernetes.io/name: example
app.kubernetes.io/instance: example
app.kubernetes.io/component: paymentservice
Expand All @@ -238,7 +238,7 @@ kind: Service
metadata:
name: example-productcatalogservice
labels:
helm.sh/chart: opentelemetry-demo-0.9.6
helm.sh/chart: opentelemetry-demo-0.10.0
app.kubernetes.io/name: example
app.kubernetes.io/instance: example
app.kubernetes.io/component: productcatalogservice
Expand All @@ -261,7 +261,7 @@ kind: Service
metadata:
name: example-quoteservice
labels:
helm.sh/chart: opentelemetry-demo-0.9.6
helm.sh/chart: opentelemetry-demo-0.10.0
app.kubernetes.io/name: example
app.kubernetes.io/instance: example
app.kubernetes.io/component: quoteservice
Expand All @@ -284,7 +284,7 @@ kind: Service
metadata:
name: example-recommendationservice
labels:
helm.sh/chart: opentelemetry-demo-0.9.6
helm.sh/chart: opentelemetry-demo-0.10.0
app.kubernetes.io/name: example
app.kubernetes.io/instance: example
app.kubernetes.io/component: recommendationservice
Expand All @@ -307,7 +307,7 @@ kind: Service
metadata:
name: example-redis
labels:
helm.sh/chart: opentelemetry-demo-0.9.6
helm.sh/chart: opentelemetry-demo-0.10.0
app.kubernetes.io/name: example
app.kubernetes.io/instance: example
app.kubernetes.io/component: redis
Expand All @@ -330,7 +330,7 @@ kind: Service
metadata:
name: example-shippingservice
labels:
helm.sh/chart: opentelemetry-demo-0.9.6
helm.sh/chart: opentelemetry-demo-0.10.0
app.kubernetes.io/name: example
app.kubernetes.io/instance: example
app.kubernetes.io/component: shippingservice
Expand All @@ -353,7 +353,7 @@ kind: Deployment
metadata:
name: example-adservice
labels:
helm.sh/chart: opentelemetry-demo-0.9.6
helm.sh/chart: opentelemetry-demo-0.10.0
app.kubernetes.io/name: example
app.kubernetes.io/instance: example
app.kubernetes.io/component: adservice
Expand Down Expand Up @@ -418,7 +418,7 @@ kind: Deployment
metadata:
name: example-cartservice
labels:
helm.sh/chart: opentelemetry-demo-0.9.6
helm.sh/chart: opentelemetry-demo-0.10.0
app.kubernetes.io/name: example
app.kubernetes.io/instance: example
app.kubernetes.io/component: cartservice
Expand Down Expand Up @@ -487,7 +487,7 @@ kind: Deployment
metadata:
name: example-checkoutservice
labels:
helm.sh/chart: opentelemetry-demo-0.9.6
helm.sh/chart: opentelemetry-demo-0.10.0
app.kubernetes.io/name: example
app.kubernetes.io/instance: example
app.kubernetes.io/component: checkoutservice
Expand Down Expand Up @@ -564,7 +564,7 @@ kind: Deployment
metadata:
name: example-currencyservice
labels:
helm.sh/chart: opentelemetry-demo-0.9.6
helm.sh/chart: opentelemetry-demo-0.10.0
app.kubernetes.io/name: example
app.kubernetes.io/instance: example
app.kubernetes.io/component: currencyservice
Expand Down Expand Up @@ -631,7 +631,7 @@ kind: Deployment
metadata:
name: example-emailservice
labels:
helm.sh/chart: opentelemetry-demo-0.9.6
helm.sh/chart: opentelemetry-demo-0.10.0
app.kubernetes.io/name: example
app.kubernetes.io/instance: example
app.kubernetes.io/component: emailservice
Expand Down Expand Up @@ -702,7 +702,7 @@ kind: Deployment
metadata:
name: example-featureflagservice
labels:
helm.sh/chart: opentelemetry-demo-0.9.6
helm.sh/chart: opentelemetry-demo-0.10.0
app.kubernetes.io/name: example
app.kubernetes.io/instance: example
app.kubernetes.io/component: featureflagservice
Expand Down Expand Up @@ -775,7 +775,7 @@ kind: Deployment
metadata:
name: example-ffspostgres
labels:
helm.sh/chart: opentelemetry-demo-0.9.6
helm.sh/chart: opentelemetry-demo-0.10.0
app.kubernetes.io/name: example
app.kubernetes.io/instance: example
app.kubernetes.io/component: ffspostgres
Expand Down Expand Up @@ -844,7 +844,7 @@ kind: Deployment
metadata:
name: example-frontend
labels:
helm.sh/chart: opentelemetry-demo-0.9.6
helm.sh/chart: opentelemetry-demo-0.10.0
app.kubernetes.io/name: example
app.kubernetes.io/instance: example
app.kubernetes.io/component: frontend
Expand Down Expand Up @@ -925,7 +925,7 @@ kind: Deployment
metadata:
name: example-loadgenerator
labels:
helm.sh/chart: opentelemetry-demo-0.9.6
helm.sh/chart: opentelemetry-demo-0.10.0
app.kubernetes.io/name: example
app.kubernetes.io/instance: example
app.kubernetes.io/component: loadgenerator
Expand Down Expand Up @@ -1004,7 +1004,7 @@ kind: Deployment
metadata:
name: example-paymentservice
labels:
helm.sh/chart: opentelemetry-demo-0.9.6
helm.sh/chart: opentelemetry-demo-0.10.0
app.kubernetes.io/name: example
app.kubernetes.io/instance: example
app.kubernetes.io/component: paymentservice
Expand Down Expand Up @@ -1069,7 +1069,7 @@ kind: Deployment
metadata:
name: example-productcatalogservice
labels:
helm.sh/chart: opentelemetry-demo-0.9.6
helm.sh/chart: opentelemetry-demo-0.10.0
app.kubernetes.io/name: example
app.kubernetes.io/instance: example
app.kubernetes.io/component: productcatalogservice
Expand Down Expand Up @@ -1136,7 +1136,7 @@ kind: Deployment
metadata:
name: example-quoteservice
labels:
helm.sh/chart: opentelemetry-demo-0.9.6
helm.sh/chart: opentelemetry-demo-0.10.0
app.kubernetes.io/name: example
app.kubernetes.io/instance: example
app.kubernetes.io/component: quoteservice
Expand Down Expand Up @@ -1209,7 +1209,7 @@ kind: Deployment
metadata:
name: example-recommendationservice
labels:
helm.sh/chart: opentelemetry-demo-0.9.6
helm.sh/chart: opentelemetry-demo-0.10.0
app.kubernetes.io/name: example
app.kubernetes.io/instance: example
app.kubernetes.io/component: recommendationservice
Expand Down Expand Up @@ -1282,7 +1282,7 @@ kind: Deployment
metadata:
name: example-redis
labels:
helm.sh/chart: opentelemetry-demo-0.9.6
helm.sh/chart: opentelemetry-demo-0.10.0
app.kubernetes.io/name: example
app.kubernetes.io/instance: example
app.kubernetes.io/component: redis
Expand Down Expand Up @@ -1343,7 +1343,7 @@ kind: Deployment
metadata:
name: example-shippingservice
labels:
helm.sh/chart: opentelemetry-demo-0.9.6
helm.sh/chart: opentelemetry-demo-0.10.0
app.kubernetes.io/name: example
app.kubernetes.io/instance: example
app.kubernetes.io/component: shippingservice
Expand Down
Loading