Skip to content

Commit b73884c

Browse files
authored
Merge branch 'main' into update-blog-policies
2 parents c8b959e + cf9e5b2 commit b73884c

35 files changed

+1603
-284
lines changed

.github/component-label-map.yml

+8
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@ blog:
22
- changed-files:
33
- any-glob-to-any-file:
44
- content/en/blog/**
5+
registry:
6+
- changed-files:
7+
- any-glob-to-any-file:
8+
- data/registry/**
9+
lang:zh:
10+
- changed-files:
11+
- any-glob-to-any-file:
12+
- content/zh/**
513
sig:cpp:
614
- changed-files:
715
- any-glob-to-any-file:

.htmltest.yml

+5-4
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,18 @@ DirectoryPath: public
33
IgnoreDirectoryMissingTrailingSlash: true
44
IgnoreAltMissing: true
55
IgnoreCanonicalBrokenLinks: false
6+
IgnoreInternalEmptyHash: true # TODO: remove after resolution of https://github.com/google/docsy/issues/1995
67
CheckMailto: false
78
TestFilesConcurrently: true
89
IgnoreDirs:
910
- ^blog/(\d+/)?page/\d+
1011
IgnoreInternalURLs: # list of paths
1112
IgnoreURLs: # list of regexs of paths or URLs to be ignored
12-
- ^/docs/languages/\w+/(api|examples|registry)/$
13-
- ^/docs/collector/registry/$
14-
- ^/docs/languages/net/(metrics-api|traces-api)/
13+
- ^(/zh)?/docs/languages/\w+/(api|examples|registry)/$
14+
- ^(/zh)?/docs/collector/registry/$
15+
- ^(/zh)?/docs/languages/net/(metrics-api|traces-api)/
16+
- ^((/zh)?/docs/migration/)?opencensus/$
1517
- ^/community/end-user/feedback-survey/$
16-
- ^(/docs/migration/)?opencensus/$
1718

1819
- ^https://deploy-preview-\d+--opentelemetry.netlify.app/
1920
- ^https://www\.googletagmanager\.com

assets/scss/_styles_project.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@
184184
}
185185

186186
details {
187-
background-color: $gray-100;
187+
background-color: var(--bs-tertiary-bg);
188188
margin-bottom: 0.5em;
189189

190190
summary {

content/en/_index.md

+3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ description: >-
44
High-quality, ubiquitous, and portable telemetry to enable effective
55
observability
66
show_banner: true
7+
outputs:
8+
- HTML
9+
- REDIRECTS # Include this `content/en` ONLY
710
developer_note:
811
The blocks/cover shortcode (used below) will use as a background image any
912
image file containing "background" in its name.

content/en/blog/2024/otel-operator-q-and-a/index.md

+353
Large diffs are not rendered by default.
Loading

content/en/docs/collector/configuration.md

+18-20
Original file line numberDiff line numberDiff line change
@@ -609,10 +609,9 @@ Collector issues. It consists of two subsections: `logs` and `metrics`.
609609
The `logs` subsection lets you configure how the logs can be generated by the
610610
Collector. By default, the Collector writes its logs to `stderr` with a log
611611
level of `INFO`. You can also add static key-value pairs to all log entries with
612-
the `initial_fields` to enrich the logging context. As per the `LogsConfig`
613-
defined in v{{%
614-
param vers %}} [here](https://github.com/open-telemetry/opentelemetry-collector/blob/v{{%
615-
param vers %}}/service/telemetry/config.go), the `logs` configuration options are:
612+
the `initial_fields` to enrich the logging context. The [`logs` configuration
613+
options](https://github.com/open-telemetry/opentelemetry-collector/blob/v{{%
614+
param vers %}}/service/telemetry/config.go) are:
616615

617616
- `level`: sets the minimum enabled logging level, default `INFO`.
618617
- `development`: puts the logger in development mode, default `false`.
@@ -635,17 +634,16 @@ The `metrics` subsection lets you configure how the metrics can be generated and
635634
exposed by the Collector. By default, the Collector generates basic metrics
636635
about itself and expose them for scraping at <http://127.0.0.1:8888/metrics>.
637636
You can expose the endpoint to a specific or even all network interfaces when
638-
needed. As per the `MetricsConfig` defined in v{{%
639-
param vers %}} [here](https://github.com/open-telemetry/opentelemetry-collector/blob/v{{%
640-
param vers %}}/service/telemetry/config.go), the `metrics` configuration options
641-
are:
637+
needed. The [`metrics` configuration
638+
options](https://github.com/open-telemetry/opentelemetry-collector/blob/v{{%
639+
param vers %}}/service/telemetry/config.go) are:
642640

643641
- `level`: the level of telemetry metrics, default `basic`. The possible values
644642
are:
645-
- "none" indicates that no telemetry data should be collected.
646-
- "basic" is the recommended and covers the basics of the service telemetry.
647-
- "normal" adds some other indicators on top of basic.
648-
- "detailed" adds dimensions and views to the previous levels.
643+
- `none`: no telemetry is collected.
644+
- `basic`: essential service telemetry.
645+
- `normal`: the default level, adds standard indicators on top of basic.
646+
- `detailed`: the most verbose level, includes dimensions and views.
649647
- `address`: the `[address]:port` formatted URL that metrics exposition should
650648
be bound to. Default `127.0.0.1:8888`.
651649

@@ -858,7 +856,7 @@ Install [`cfssl`](https://github.com/cloudflare/cfssl) and create the following
858856

859857
Then run the following commands:
860858

861-
```bash
859+
```sh
862860
cfssl genkey -initca csr.json | cfssljson -bare ca
863861
cfssl gencert -ca ca.pem -ca-key ca-key.pem csr.json | cfssljson -bare cert
864862
```
@@ -880,14 +878,14 @@ define with this method are merged into the final configuration after all
880878

881879
The following examples show how to override settings inside nested sections:
882880

883-
```shell
884-
# The following example sets the verbosity
885-
# level of the debug exporter to 'detailed'
881+
```sh
886882
otelcol --set "exporters::debug::verbosity=detailed"
887-
# The following example overrides gRPC
888-
# settings for the OTLP receiver
889883
otelcol --set "receivers::otlp::protocols::grpc={endpoint:localhost:4317, compression: gzip}"
890884
```
891885

892-
Note tha the `--set` option doesn't support setting a key that contains a dot or
893-
an equal sign.
886+
{{% alert title="Important" color="warning" %}}
887+
888+
The `--set` option doesn't support setting a key that contains a dot or an equal
889+
sign.
890+
891+
{{% /alert %}}

0 commit comments

Comments
 (0)