Skip to content

Commit 5e1d5b1

Browse files
authored
Merge pull request #88499 from kalexand-rh/fix4.17apis
fixing api builds
2 parents 7971128 + 6d9b3d8 commit 5e1d5b1

9 files changed

+165
-165
lines changed

modules/network-flow-matrix.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,4 +102,4 @@ In addition to the base network flows, the following matrix describes the ingres
102102
[%header,format=csv]
103103
|===
104104
include::https://raw.githubusercontent.com/openshift-kni/commatrix/release-4.18/docs/stable/unique/aws-sno.csv[]
105-
|===
105+
|===

observability/distr_tracing/distr-tracing-rn.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ endif::openshift-rosa[]
139139
[id="distr-tracing_3-3-1_{context}"]
140140
== Release notes for {DTProductName} 3.3.1
141141

142-
The {DTProductName} 3.3.1 is a maintenance release with no changes because the {DTProductName} is bundled with the {OTELName} that is xref:../otel/otel-rn.adoc#otel-rn[released] with a bug fix.
142+
The {DTProductName} 3.3.1 is a maintenance release with no changes because the {DTProductName} is bundled with the {OTELName} that is xref:../otel/otel-rn.adoc#otel_rn[released] with a bug fix.
143143

144144
This release of the {DTProductName} includes the {TempoName} and the deprecated {JaegerName}.
145145

rest_api/monitoring_apis/podmonitor-monitoring-coreos-com-v1.adoc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ Cannot be set at the same time as `authorization`, or `basicAuth`.
356356

357357
| `params{}`
358358
| `array (string)`
359-
|
359+
|
360360

361361
| `path`
362362
| `string`
@@ -382,7 +382,7 @@ metadata labels.
382382

383383
The Operator automatically adds relabelings for a few standard Kubernetes fields.
384384

385-
The original scrape job's name is available via the `__tmp_prometheus_job_name` label.
385+
The original scrape job's name is available via the `\__tmp_prometheus_job_name` label.
386386

387387
More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config
388388

@@ -780,7 +780,7 @@ It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0.
780780

781781
| `proxyConnectHeader{}`
782782
| `array`
783-
|
783+
|
784784

785785
| `proxyConnectHeader{}[]`
786786
| `object`
@@ -1316,7 +1316,7 @@ metadata labels.
13161316

13171317
The Operator automatically adds relabelings for a few standard Kubernetes fields.
13181318

1319-
The original scrape job's name is available via the `__tmp_prometheus_job_name` label.
1319+
The original scrape job's name is available via the `\__tmp_prometheus_job_name` label.
13201320

13211321
More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config
13221322
--
@@ -1866,7 +1866,7 @@ Description::
18661866
| Parameter | Type | Description
18671867
| `body`
18681868
| xref:../monitoring_apis/podmonitor-monitoring-coreos-com-v1.adoc#podmonitor-monitoring-coreos-com-v1[`PodMonitor`] schema
1869-
|
1869+
|
18701870
|===
18711871

18721872
.HTTP responses
@@ -1999,7 +1999,7 @@ Description::
19991999
| Parameter | Type | Description
20002000
| `body`
20012001
| xref:../monitoring_apis/podmonitor-monitoring-coreos-com-v1.adoc#podmonitor-monitoring-coreos-com-v1[`PodMonitor`] schema
2002-
|
2002+
|
20032003
|===
20042004

20052005
.HTTP responses

rest_api/monitoring_apis/probe-monitoring-coreos-com-v1.adoc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,7 @@ It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0.
530530

531531
| `proxyConnectHeader{}`
532532
| `array`
533-
|
533+
|
534534

535535
| `proxyConnectHeader{}[]`
536536
| `object`
@@ -1143,9 +1143,9 @@ Type::
11431143
| RelabelConfigs to apply to the label set of the target before it gets
11441144
scraped.
11451145
The original ingress address is available via the
1146-
`__tmp_prometheus_ingress_address` label. It can be used to customize the
1146+
`\__tmp_prometheus_ingress_address` label. It can be used to customize the
11471147
probed URL.
1148-
The original scrape job's name is available via the `__tmp_prometheus_job_name` label.
1148+
The original scrape job's name is available via the `\__tmp_prometheus_job_name` label.
11491149
More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config
11501150

11511151
| `relabelingConfigs[]`
@@ -1194,9 +1194,9 @@ Description::
11941194
RelabelConfigs to apply to the label set of the target before it gets
11951195
scraped.
11961196
The original ingress address is available via the
1197-
`__tmp_prometheus_ingress_address` label. It can be used to customize the
1197+
`\__tmp_prometheus_ingress_address` label. It can be used to customize the
11981198
probed URL.
1199-
The original scrape job's name is available via the `__tmp_prometheus_job_name` label.
1199+
The original scrape job's name is available via the `\__tmp_prometheus_job_name` label.
12001200
More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config
12011201
--
12021202

@@ -1868,7 +1868,7 @@ Description::
18681868
| Parameter | Type | Description
18691869
| `body`
18701870
| xref:../monitoring_apis/probe-monitoring-coreos-com-v1.adoc#probe-monitoring-coreos-com-v1[`Probe`] schema
1871-
|
1871+
|
18721872
|===
18731873

18741874
.HTTP responses
@@ -2001,7 +2001,7 @@ Description::
20012001
| Parameter | Type | Description
20022002
| `body`
20032003
| xref:../monitoring_apis/probe-monitoring-coreos-com-v1.adoc#probe-monitoring-coreos-com-v1[`Probe`] schema
2004-
|
2004+
|
20052005
|===
20062006

20072007
.HTTP responses

rest_api/monitoring_apis/prometheus-monitoring-coreos-com-v1.adoc

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -823,7 +823,7 @@ in a breaking way.
823823

824824
| `scrapeClasses[]`
825825
| `object`
826-
|
826+
|
827827

828828
| `scrapeConfigNamespaceSelector`
829829
| `object`
@@ -968,7 +968,7 @@ the triple <key,value,effect> using the matching operator <operator>.
968968

969969
| `topologySpreadConstraints[]`
970970
| `object`
971-
|
971+
|
972972

973973
| `tracingConfig`
974974
| `object`
@@ -4368,7 +4368,7 @@ Type::
43684368

43694369
| `deny`
43704370
| `boolean`
4371-
|
4371+
|
43724372

43734373
|===
43744374
=== .spec.containers
@@ -10201,7 +10201,7 @@ It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0.
1020110201

1020210202
| `proxyConnectHeader{}`
1020310203
| `array`
10204-
|
10204+
|
1020510205

1020610206
| `proxyConnectHeader{}[]`
1020710207
| `object`
@@ -10475,7 +10475,7 @@ It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0.
1047510475

1047610476
| `proxyConnectHeader{}`
1047710477
| `array`
10478-
|
10478+
|
1047910479

1048010480
| `proxyConnectHeader{}[]`
1048110481
| `object`
@@ -11484,7 +11484,7 @@ It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0.
1148411484

1148511485
| `proxyConnectHeader{}`
1148611486
| `array`
11487-
|
11487+
|
1148811488

1148911489
| `proxyConnectHeader{}[]`
1149011490
| `object`
@@ -11982,7 +11982,7 @@ It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0.
1198211982

1198311983
| `proxyConnectHeader{}`
1198411984
| `array`
11985-
|
11985+
|
1198611986

1198711987
| `proxyConnectHeader{}[]`
1198811988
| `object`
@@ -13541,7 +13541,7 @@ More info: https://prometheus.io/docs/prometheus/latest/configuration/configurat
1354113541
| Relabelings configures the relabeling rules to apply to all scrape targets.
1354213542

1354313543
The Operator automatically adds relabelings for a few standard Kubernetes fields
13544-
like `__meta_kubernetes_namespace` and `__meta_kubernetes_service_name`.
13544+
like `\__meta_kubernetes_namespace` and `\__meta_kubernetes_service_name`.
1354513545
Then the Operator adds the scrape class relabelings defined here.
1354613546
Then the Operator adds the target-specific relabelings defined in the scrape object.
1354713547

@@ -13683,7 +13683,7 @@ Description::
1368313683
Relabelings configures the relabeling rules to apply to all scrape targets.
1368413684

1368513685
The Operator automatically adds relabelings for a few standard Kubernetes fields
13686-
like `__meta_kubernetes_namespace` and `__meta_kubernetes_service_name`.
13686+
like `\__meta_kubernetes_namespace` and `\__meta_kubernetes_service_name`.
1368713687
Then the Operator adds the scrape class relabelings defined here.
1368813688
Then the Operator adds the target-specific relabelings defined in the scrape object.
1368913689

@@ -15850,7 +15850,7 @@ persistent volume is being resized.
1585015850

1585115851
| `status`
1585215852
| `string`
15853-
|
15853+
|
1585415854

1585515855
| `type`
1585615856
| `string`
@@ -20992,7 +20992,7 @@ being performed. Only delete actions will be performed.
2099220992

2099320993
| `shardStatuses[]`
2099420994
| `object`
20995-
|
20995+
|
2099620996

2099720997
| `shards`
2099820998
| `integer`
@@ -21246,7 +21246,7 @@ Description::
2124621246
| Parameter | Type | Description
2124721247
| `body`
2124821248
| xref:../monitoring_apis/prometheus-monitoring-coreos-com-v1.adoc#prometheus-monitoring-coreos-com-v1[`Prometheus`] schema
21249-
|
21249+
|
2125021250
|===
2125121251

2125221252
.HTTP responses
@@ -21379,7 +21379,7 @@ Description::
2137921379
| Parameter | Type | Description
2138021380
| `body`
2138121381
| xref:../monitoring_apis/prometheus-monitoring-coreos-com-v1.adoc#prometheus-monitoring-coreos-com-v1[`Prometheus`] schema
21382-
|
21382+
|
2138321383
|===
2138421384

2138521385
.HTTP responses
@@ -21481,7 +21481,7 @@ Description::
2148121481
| Parameter | Type | Description
2148221482
| `body`
2148321483
| xref:../autoscale_apis/scale-autoscaling-v1.adoc#scale-autoscaling-v1[`Scale`] schema
21484-
|
21484+
|
2148521485
|===
2148621486

2148721487
.HTTP responses
@@ -21583,7 +21583,7 @@ Description::
2158321583
| Parameter | Type | Description
2158421584
| `body`
2158521585
| xref:../monitoring_apis/prometheus-monitoring-coreos-com-v1.adoc#prometheus-monitoring-coreos-com-v1[`Prometheus`] schema
21586-
|
21586+
|
2158721587
|===
2158821588

2158921589
.HTTP responses

rest_api/monitoring_apis/servicemonitor-monitoring-coreos-com-v1.adoc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ Cannot be set at the same time as `authorization`, or `basicAuth`.
346346

347347
| `params{}`
348348
| `array (string)`
349-
|
349+
|
350350

351351
| `path`
352352
| `string`
@@ -372,7 +372,7 @@ metadata labels.
372372

373373
The Operator automatically adds relabelings for a few standard Kubernetes fields.
374374

375-
The original scrape job's name is available via the `__tmp_prometheus_job_name` label.
375+
The original scrape job's name is available via the `\__tmp_prometheus_job_name` label.
376376

377377
More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config
378378

@@ -768,7 +768,7 @@ It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0.
768768

769769
| `proxyConnectHeader{}`
770770
| `array`
771-
|
771+
|
772772

773773
| `proxyConnectHeader{}[]`
774774
| `object`
@@ -1304,7 +1304,7 @@ metadata labels.
13041304

13051305
The Operator automatically adds relabelings for a few standard Kubernetes fields.
13061306

1307-
The original scrape job's name is available via the `__tmp_prometheus_job_name` label.
1307+
The original scrape job's name is available via the `\__tmp_prometheus_job_name` label.
13081308

13091309
More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config
13101310
--
@@ -1894,7 +1894,7 @@ Description::
18941894
| Parameter | Type | Description
18951895
| `body`
18961896
| xref:../monitoring_apis/servicemonitor-monitoring-coreos-com-v1.adoc#servicemonitor-monitoring-coreos-com-v1[`ServiceMonitor`] schema
1897-
|
1897+
|
18981898
|===
18991899

19001900
.HTTP responses
@@ -2027,7 +2027,7 @@ Description::
20272027
| Parameter | Type | Description
20282028
| `body`
20292029
| xref:../monitoring_apis/servicemonitor-monitoring-coreos-com-v1.adoc#servicemonitor-monitoring-coreos-com-v1[`ServiceMonitor`] schema
2030-
|
2030+
|
20312031
|===
20322032

20332033
.HTTP responses

0 commit comments

Comments
 (0)