add grafana and prometheus

charts/opentelemetry-demo/Chart.lock

@@ -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:eeee9eaf95d8ae18f0724258956c9e548bec97f0e3382995499cf3dced878ed1
+generated: "2022-10-20T18:09:03.02878-04:00"

charts/opentelemetry-demo/Chart.yaml

@@ -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:
@@ -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.prometheus.enabled

charts/opentelemetry-demo/examples/default/rendered/component.yaml

@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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

charts/opentelemetry-demo/examples/default/rendered/jaeger.yaml

@@ -5,7 +5,7 @@ kind: Service
 metadata:
   name: example-jaeger
   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: jaeger
@@ -33,7 +33,7 @@ kind: Deployment
 metadata:
   name: example-jaeger
   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: jaeger

charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/configmap.yaml

@@ -18,6 +18,8 @@ data:
         endpoint: 'example-jaeger:4317'
         tls:
           insecure: true
+      prometheus:
+        endpoint: 0.0.0.0:9464
     extensions:
       health_check: {}
       memory_ballast: {}
@@ -27,6 +29,8 @@ data:
         check_interval: 5s
         limit_mib: 80
         spike_limit_mib: 25
+      spanmetrics:
+        metrics_exporter: prometheus
     receivers:
       jaeger:
         protocols:
@@ -46,14 +50,18 @@ data:
               - http://*
               - https://*
             endpoint: 0.0.0.0:4318
+      otlp/spanmetrics:
+        protocols:
+          grpc:
+            endpoint: localhost:65535
       prometheus:
         config:
           scrape_configs:
-          - job_name: opentelemetry-collector
-            scrape_interval: 10s
+          - job_name: otel-collector
+            scrape_interval: 5s
             static_configs:
             - targets:
-              - ${MY_POD_IP}:8888
+              - 0.0.0.0:8888
       zipkin:
         endpoint: 0.0.0.0:9411
     service:
@@ -71,24 +79,29 @@ data:
           - otlp
         metrics:
           exporters:
+          - prometheus
           - logging
           processors:
-          - memory_limiter
           - batch
           receivers:
           - otlp
           - prometheus
-        traces:
+        metrics/spanmetrics:
           exporters:
+          - prometheus
           - logging
+          receivers:
+          - otlp/spanmetrics
+        traces:
+          exporters:
           - otlp
+          - logging
           processors:
-          - memory_limiter
+          - spanmetrics
           - batch
           receivers:
           - otlp
-          - jaeger
-          - zipkin
       telemetry:
         metrics:
           address: 0.0.0.0:8888
+          level: detailed