Skip to content

Commit 442aae5

Browse files
authored
Merge branch 'main' into blackboxai/route-base-url-to-knative-dev
2 parents 2c79dca + d843a31 commit 442aae5

File tree

19 files changed

+212
-143
lines changed

19 files changed

+212
-143
lines changed

OWNERS_ALIASES

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,15 @@
22
# Do not modify this file, instead modify peribolos/knative.yaml
33

44
aliases:
5-
client-reviewers:
6-
- itsmurugappan
5+
client-reviewers: []
76
client-wg-leads:
87
- dsimansk
98
client-writers:
109
- dsimansk
11-
- vyasgun
1210
docs-reviewers:
1311
- nainaz
1412
- skonto
1513
docs-writers:
16-
- csantanapr
1714
- skonto
1815
eventing-reviewers:
1916
- Leo6Leo
@@ -28,7 +25,6 @@ aliases:
2825
- aliok
2926
- cali0707
3027
- creydr
31-
- lionelvillard
3228
- matzew
3329
- pierDipi
3430
func-reviewers:
@@ -37,7 +33,6 @@ aliases:
3733
func-writers:
3834
- gauron99
3935
- jrangelramos
40-
- lance
4136
- lkingland
4237
- matejvasek
4338
- matzew
@@ -47,6 +42,7 @@ aliases:
4742
- salaboy
4843
knative-admin:
4944
- aliok
45+
- arsenetar
5046
- cardil
5147
- dprotaso
5248
- dsimansk
@@ -58,7 +54,6 @@ aliases:
5854
- knative-prow-updater-robot
5955
- knative-test-reporter-robot
6056
- matzew
61-
- nrrso
6257
- skonto
6358
- upodroid
6459
knative-release-leads:
@@ -115,10 +110,10 @@ aliases:
115110
- skonto
116111
steering-committee:
117112
- aliok
113+
- arsenetar
118114
- dprotaso
119115
- evankanderson
120116
- matzew
121-
- nrrso
122117
ux-wg-leads:
123118
- Leo6Leo
124119
- cali0707

blog/docs/articles/distributed-tracing.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Distributed tracing with Knative, OpenTelemetry and Jaeger
22

3+
!!! note
4+
Knative Release 1.19 and higher supports emitting OpenTelemetry traces. So the contents of this post are out of date.
5+
36
**Author: [Ben Moss](https://twitter.com/mossity), Software Engineer @ [VMware](http://vmware.com)**
47

58
When trying to understand and diagnose our systems, one of the most basic tools

blog/docs/articles/orchestrating-cloud-events-with.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Orchestrating CloudEvents with Knative and Zeebe
22

3-
**Author: [Mauricio Salatino (Salaboy)](https://twitter.com/salaboy), Principal Software Engineer @ [Camunda](http://camunda.com) and [LearnK8s](http://learnk8s.io) Instructor**
3+
**Author: [Mauricio Salatino (Salaboy)](https://twitter.com/salaboy), Principal Software Engineer @ [Camunda](http://camunda.com) and [LearnKube](http://learnkube.com) Instructor**
44

55
A couple of weeks ago, I presented at the **Knative Meetup** ([Video](https://www.youtube.com/watch?v=msDDdqmyEFA&list=PLQjzPfIiEQLIEpoCPxBYAVrjqy6LxLtQ8), [Slides](https://www.slideshare.net/salaboy/orchestrating-cloud-events-knative-meetup-2020)) about how you can leverage the Cloud Native workflow engine [Zeebe](http://zeebe.io) to understand, enhance and orchestrate your applications that are already using [CloudEvents](https://cloudevents.io).
66

blog/docs/releases/announcing-knative-v1-19-release.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ type: "blog"
1010

1111
## Announcing Knative v1.19 Release
1212

13+
!!! note
14+
We've discovered severe issues with the OpenTelemetry Prometheus Exporter (see: https://github.com/knative/pkg/issues/3224). We advise users to hold off upgrading until we have new patch releases out.
15+
1316
A new version of Knative is now available across multiple components.
1417

1518
Follow the instructions in

config/nav.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,6 @@ nav:
157157
# Serving - admin docs
158158
- Administrator Topics:
159159
- Kubernetes services: serving/knative-kubernetes-services.md
160-
- Accessing request traces: serving/accessing-traces.md
161160
- Enabling requests to Knative services when additional authorization policies are enabled: serving/istio-authorization.md
162161
- Exclude namespaces from the Knative webhook: serving/webhook-customizations.md
163162
- Configuring high-availability components: serving/config-ha.md
@@ -184,6 +183,7 @@ nav:
184183
- Security-Guard example alerts: serving/app-security/security-guard-example-alerts.md
185184
# Serving - observability
186185
- Observability:
186+
- Request traces: serving/observability/accessing-traces.md
187187
- Collecting logs: serving/observability/logging/collecting-logs.md
188188
- Configuring logging: serving/observability/logging/config-logging.md
189189
- Configuring Request logging: serving/observability/logging/request-logging.md
@@ -303,7 +303,7 @@ nav:
303303
- Configure KEDA Autoscaling of Knative Kafka Resources: eventing/configuration/keda-configuration.md
304304
# Eventing - observability
305305
- Observability:
306-
- Accessing CloudEvent traces: eventing/accessing-traces.md
306+
- Accessing CloudEvent traces: eventing/observability/accessing-traces.md
307307
- Collecting logs: eventing/observability/logging/collecting-logs.md
308308
- Configuring logging: eventing/observability/logging/config-logging.md
309309
- Collecting metrics: eventing/observability/metrics/collecting-metrics.md

docs/eventing/accessing-traces.md renamed to docs/eventing/observability/accessing-traces.md

Lines changed: 37 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,25 @@ function: how-to
88

99
# Accessing CloudEvent traces
1010

11-
Depending on the request tracing tool that you have installed on your Knative
12-
Eventing cluster, see the corresponding section for details about how to
13-
visualize and trace your requests.
11+
Traces give us the big picture of how events traverse through the system and applications.
12+
Knative Eventing is instrumented with [OpenTelemetry](https://opentelemetry.io/docs/what-is-opentelemetry/) which can emit traces to a multitude of different backends.
1413

15-
## Before you begin
14+
## Backends
1615

17-
You must have a Knative cluster running with the Eventing component installed. [Learn more](../install/README.md).
16+
### Jaeger V2
1817

19-
## Configuring tracing
18+
Following [these instructions](https://github.com/jaegertracing/jaeger-operator?tab=readme-ov-file#jaeger-v2-operator) to setup Jaeger V2 on Kubernetes and access your traces.
19+
20+
## Configuring Eventing Tracing
21+
22+
You can update the configuration for tracing in using the [`config-observability` ConfigMap](https://github.com/knative/eventing/blob/main/config/core/configmaps/observability.yaml).
2023

2124
With the exception of importers, the Knative Eventing tracing is configured through the
22-
`config-tracing` ConfigMap in the `knative-eventing` namespace.
25+
`config-observability` ConfigMap in the `knative-eventing` namespace.
2326

2427
Most importers do _not_ use the ConfigMap and instead, use a static 1% sampling rate.
2528

26-
You can use the `config-tracing` ConfigMap to configure the following Eventing components:
29+
You can use the `config-observability` ConfigMap to configure the following Eventing components:
2730

2831
- Brokers
2932
- Triggers
@@ -36,59 +39,61 @@ You can use the `config-tracing` ConfigMap to configure the following Eventing c
3639

3740
**Example:**
3841

39-
The following example `config-tracing` ConfigMap samples 10% of all CloudEvents:
42+
The following example `config-observability` ConfigMap samples 10% of all CloudEvents:
4043

4144
```yaml
4245
apiVersion: v1
4346
kind: ConfigMap
4447
metadata:
45-
name: config-tracing
48+
name: config-observability
4649
namespace: knative-eventing
4750
data:
48-
backend: "zipkin"
49-
zipkin-endpoint: "http://zipkin.istio-system.svc.cluster.local:9411/api/v2/spans"
50-
sample-rate: "0.1"
51+
tracing-protocol: "grpc"
52+
tracing-endpoint: "http://jaeger-collector.observability:4318/v1/traces"
53+
tracing-sampling-rate: "0.1"
5154
```
5255
5356
### Configuration options
5457
55-
You can configure your `config-tracing` with following options:
58+
You can configure your `config-observability` with following options:
5659

57-
* `backend`: Valid values are `zipkin` or `none`. The default is `none`.
60+
* `tracing-protocol`: Valid values are `grpc` or `http/protobuf`. The default is `none`.
5861

59-
* `zipkin-endpoint`: Specifies the URL to the zipkin collector where you want to send the traces.
60-
Must be set if backend is set to `zipkin`.
62+
* `tracing-endpoint`: Specifies the URL to the backend where you want to send the traces.
63+
Must be set if backend is set to `grpc` or `http/protobuf`.
6164

62-
* `sample-rate`: Specifies the sampling rate. Valid values are decimals from `0` to `1`
65+
* `tracing-sampling-rate`: Specifies the sampling rate. Valid values are decimals from `0` to `1`
6366
(interpreted as a float64), which indicate the probability that any given request is sampled.
6467
An example value is `0.5`, which gives each request a 50% sampling probablity.
6568

66-
* `debug`: Enables debugging. Valid values are `true` or `false`. Defaults to `false` when not specified.
67-
Set to `true` to enable debug mode, which forces the `sample-rate` to `1.0` and sends all spans to
68-
the server.
69-
70-
### Viewing your `config-tracing` ConfigMap
69+
### Viewing your `config-observability` ConfigMap
7170

7271
To view your current configuration:
7372

7473
```bash
75-
kubectl -n knative-eventing get configmap config-tracing -oyaml
74+
kubectl -n knative-eventing get configmap config-observability -oyaml
7675
```
7776

78-
### Editing and deploying your `config-tracing` ConfigMap
77+
### Editing and deploying your `config-observability` ConfigMap
7978

8079
To edit and then immediately deploy changes to your ConfigMap, run the following command:
8180

8281
```bash
83-
kubectl -n knative-eventing edit configmap config-tracing
82+
kubectl -n knative-eventing edit configmap config-observability
8483
```
8584

86-
## Accessing traces in Eventing
8785

88-
To access the traces, you use either the Zipkin or Jaeger tool. Details about using these tools to access traces are provided in the Knative Serving observability section:
86+
<!--
87+
TODO - Renable and redo the images when the following test is enabled again
88+
https://github.com/knative/eventing/blob/main/test/conformance/broker_tracing_test.go#L31
89+
90+
t.Skip("needs to be reworked for OTel (eventing#8637)")
8991

90-
- [Zipkin](../serving/accessing-traces.md#zipkin)
91-
- [Jaeger](../serving/accessing-traces.md#jaeger)
92+
## Accessing traces
93+
94+
To access the traces, you use either the Zipkin or Jaeger tool.
95+
96+
- [Zipkin](../serving/observability/accessing-traces.md)
9297

9398
### Example
9499

@@ -132,3 +137,5 @@ This is the same screenshot without the annotations.
132137
![Raw Trace](images/RawTrace.png)
133138

134139
If you are interested, here is the [raw JSON](data/2e571e6948ff981283825bb2bf51c87d.json) of the trace.
140+
141+
-->

docs/install/uninstall.md

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -33,20 +33,6 @@ Uninstall any Serving extensions you have installed by performing the steps in t
3333
kubectl delete -f {{ artifact( repo="serving", file="serving-hpa.yaml") }}
3434
```
3535

36-
37-
38-
=== "TLS with cert-manager"
39-
40-
1. Uninstall the component that integrates Knative with cert-manager:
41-
42-
```bash
43-
kubectl delete -f {{ artifact( repo="net-certmanager", file="release.yaml") }}
44-
```
45-
46-
1. Optional: if you no longer need cert-manager, uninstall it by following the steps in the
47-
[cert-manager documentation](https://cert-manager.io/docs/installation/uninstall/kubernetes/).
48-
49-
5036
### Uninstalling a networking layer
5137

5238
Follow the relevant procedure to uninstall the networking layer you installed:

docs/serving/accessing-traces.md

Lines changed: 0 additions & 73 deletions
This file was deleted.

docs/serving/knative-kubernetes-services.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ that are active when running Knative Serving.
4444
activator 1 1 1 1 1h
4545
autoscaler 1 1 1 1 1h
4646
controller 1 1 1 1 1h
47-
net-certmanager-controller 1 1 1 1 1h
4847
net-istio-controller 1 1 1 1 1h
4948
webhook 1 1 1 1 1h
5049
```
@@ -78,10 +77,6 @@ The webhook intercepts all Kubernetes API calls as well as all CRD insertions
7877
and updates. It sets default values, rejects inconsistent and invalid objects,
7978
and validates and mutates Kubernetes API calls.
8079

81-
### Deployment: net-certmanager-controller
82-
83-
The certmanager reconciles cluster ingresses into cert manager objects.
84-
8580
### Deployment: net-istio-controller
8681

8782
The net-istio-controller deployment reconciles a cluster's ingress into an

0 commit comments

Comments
 (0)