diff --git a/01-welcome-setup.md b/01-welcome-setup.md index a7dc739..c93db51 100644 --- a/01-welcome-setup.md +++ b/01-welcome-setup.md @@ -33,7 +33,7 @@ If this is not the case, simply download the [kind-v0.22.0](https://github.com/k After a successful installation, a cluster can be created as follows: ```bash -kind create cluster --name=workshop --image kindest/node:v1.27.3 +kind create cluster --name=workshop --config=kind-1.29.yaml ``` Kind automatically sets the kube context to the created workshop cluster. We can easily check this by getting information about our nodes. @@ -45,7 +45,7 @@ Expected is the following: ```bash NAME STATUS ROLES AGE VERSION -workshop-control-plane Ready control-plane 75s v1.27.3 +workshop-control-plane Ready control-plane 75s v1.29.1 ``` ### Cleanup diff --git a/05-sampling.md b/05-sampling.md index 9815a7d..a41a551 100644 --- a/05-sampling.md +++ b/05-sampling.md @@ -16,7 +16,7 @@ For example, a medium sized setup producing ~1M traces per minute can result in Pricing: - AWS Xray ([calculator](https://aws.amazon.com/xray/pricing/)) -- GCP Cloud Trace [pricing](https://cloud.google.com/stackdriver/pricing#trace-costs) +- GCP Cloud Trace ([pricing](https://cloud.google.com/stackdriver/pricing#trace-costs)) ``` GCP diff --git a/08-k8s-tracing.md b/08-k8s-tracing.md index 095015a..0bc86f6 100644 --- a/08-k8s-tracing.md +++ b/08-k8s-tracing.md @@ -88,6 +88,20 @@ spec: priorityClassName: system-node-critical ``` +Once the API-Server and ETCD are reporting telemetry data we can make some noise by creating and deleting an nginx instance: +```bash +$ kubectl create deployment nginx-project --image=nginx +deployment.apps/nginx-project created +--- +$ kubectl get deployments.apps +NAME READY UP-TO-DATE AVAILABLE AGE +nginx-project 1/1 1 1 1m +--- +$ kubectl delete deployments.apps nginx-project +deployment.apps "nginx-project" deleted +``` + +![api-server](images/api-server.png) ## Kubelet @@ -112,3 +126,6 @@ This should be the effect: volumeStatsAggPeriod: 0s ``` + +![terminating](images/terminating.png) +![terminated](images/terminated.png) diff --git a/app/otel-daemonset.yaml b/app/otel-daemonset.yaml index a65c509..0335022 100644 --- a/app/otel-daemonset.yaml +++ b/app/otel-daemonset.yaml @@ -1,3 +1,4 @@ +--- apiVersion: opentelemetry.io/v1alpha1 kind: OpenTelemetryCollector metadata: diff --git a/images/api-server.png b/images/api-server.png new file mode 100644 index 0000000..c92e252 Binary files /dev/null and b/images/api-server.png differ diff --git a/images/rolldice-delay.png b/images/rolldice-delay.png index 0f0bdb2..df0c97d 100644 Binary files a/images/rolldice-delay.png and b/images/rolldice-delay.png differ diff --git a/images/rolldice-error.png b/images/rolldice-error.png index d339d83..ebe656c 100644 Binary files a/images/rolldice-error.png and b/images/rolldice-error.png differ diff --git a/images/terminated.png b/images/terminated.png new file mode 100644 index 0000000..8ff0d52 Binary files /dev/null and b/images/terminated.png differ diff --git a/images/terminating.png b/images/terminating.png new file mode 100644 index 0000000..fcc0ffd Binary files /dev/null and b/images/terminating.png differ diff --git a/kind-1.29.yaml b/kind-1.29.yaml index cfaafbf..f332152 100644 --- a/kind-1.29.yaml +++ b/kind-1.29.yaml @@ -38,7 +38,7 @@ nodes: extraArgs: tracing-config-file: "/api-server/tracing-config.yaml" extraVolumes: - - name: tracingConfig + - name: tracing-config hostPath: /api-server/tracing-config.yaml mountPath: /api-server/tracing-config.yaml readOnly: true