Skip to content

Commit 2f4fecd

Browse files
kalexand-rhkalexand-rh
authored
Merge pull request #100776 from kalexand-rh/4.20restapiagain
fixing api docs errors
2 parents 6d993e7 + bc2bba5 commit 2f4fecd

15 files changed

+236
-236
lines changed

‎rest_api/image_apis/imagestreamimport-image-openshift-io-v1.adoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ Required::
138138
| TagReferencePolicy describes how pull-specs for images in this image stream tag are generated when image change triggers in deployment configs or builds are resolved. This allows the image stream author to control how images are accessed.
139139

140140
| `to`
141-
| xref:../objects/index.adoc#io-k8s-api-core-v1-LocalObjectReference_v2[`LocalObjectReference_v2`]
141+
| `LocalObjectReference_v2`
142142
| To is a tag in the current image stream to assign the imported image to, if name is not specified the default tag from from.name will be used
143143

144144
|===
@@ -2524,7 +2524,7 @@ Description::
25242524
| Parameter | Type | Description
25252525
| `body`
25262526
| xref:../image_apis/imagestreamimport-image-openshift-io-v1.adoc#imagestreamimport-image-openshift-io-v1[`ImageStreamImport`] schema
2527-
|
2527+
|
25282528
|===
25292529

25302530
.HTTP responses

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

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

387387
| `params{}`
388388
| `array (string)`
389-
|
389+
|
390390

391391
| `path`
392392
| `string`
@@ -436,7 +436,7 @@ metadata labels.
436436

437437
The Operator automatically adds relabelings for a few standard Kubernetes fields.
438438

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

441441
More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config
442442

@@ -835,7 +835,7 @@ It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
835835

836836
| `proxyConnectHeader{}`
837837
| `array`
838-
|
838+
|
839839

840840
| `proxyConnectHeader{}[]`
841841
| `object`
@@ -1436,7 +1436,7 @@ metadata labels.
14361436

14371437
The Operator automatically adds relabelings for a few standard Kubernetes fields.
14381438

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

14411441
More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config
14421442
--
@@ -1986,7 +1986,7 @@ Description::
19861986
| Parameter | Type | Description
19871987
| `body`
19881988
| xref:../monitoring_apis/podmonitor-monitoring-coreos-com-v1.adoc#podmonitor-monitoring-coreos-com-v1[`PodMonitor`] schema
1989-
|
1989+
|
19901990
|===
19911991

19921992
.HTTP responses
@@ -2119,7 +2119,7 @@ Description::
21192119
| Parameter | Type | Description
21202120
| `body`
21212121
| xref:../monitoring_apis/podmonitor-monitoring-coreos-com-v1.adoc#podmonitor-monitoring-coreos-com-v1[`PodMonitor`] schema
2122-
|
2122+
|
21232123
|===
21242124

21252125
.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
@@ -554,7 +554,7 @@ It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
554554

555555
| `proxyConnectHeader{}`
556556
| `array`
557-
|
557+
|
558558

559559
| `proxyConnectHeader{}[]`
560560
| `object`
@@ -1304,9 +1304,9 @@ Type::
13041304
| RelabelConfigs to apply to the label set of the target before it gets
13051305
scraped.
13061306
The original ingress address is available via the
1307-
`__tmp_prometheus_ingress_address` label. It can be used to customize the
1307+
`\__tmp_prometheus_ingress_address` label. It can be used to customize the
13081308
probed URL.
1309-
The original scrape job's name is available via the `__tmp_prometheus_job_name` label.
1309+
The original scrape job's name is available via the `\__tmp_prometheus_job_name` label.
13101310
More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config
13111311

13121312
| `relabelingConfigs[]`
@@ -1355,9 +1355,9 @@ Description::
13551355
RelabelConfigs to apply to the label set of the target before it gets
13561356
scraped.
13571357
The original ingress address is available via the
1358-
`__tmp_prometheus_ingress_address` label. It can be used to customize the
1358+
`\__tmp_prometheus_ingress_address` label. It can be used to customize the
13591359
probed URL.
1360-
The original scrape job's name is available via the `__tmp_prometheus_job_name` label.
1360+
The original scrape job's name is available via the `\__tmp_prometheus_job_name` label.
13611361
More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config
13621362
--
13631363

@@ -2029,7 +2029,7 @@ Description::
20292029
| Parameter | Type | Description
20302030
| `body`
20312031
| xref:../monitoring_apis/probe-monitoring-coreos-com-v1.adoc#probe-monitoring-coreos-com-v1[`Probe`] schema
2032-
|
2032+
|
20332033
|===
20342034

20352035
.HTTP responses
@@ -2162,7 +2162,7 @@ Description::
21622162
| Parameter | Type | Description
21632163
| `body`
21642164
| xref:../monitoring_apis/probe-monitoring-coreos-com-v1.adoc#probe-monitoring-coreos-com-v1[`Probe`] schema
2165-
|
2165+
|
21662166
|===
21672167

21682168
.HTTP responses

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -865,7 +865,7 @@ in a breaking way.
865865

866866
| `scrapeClasses[]`
867867
| `object`
868-
|
868+
|
869869

870870
| `scrapeClassicHistograms`
871871
| `boolean`
@@ -1021,7 +1021,7 @@ ServiceMonitor and ScrapeConfig resources.
10211021
* The `__param_target__` label for Probe resources.
10221022

10231023
Users can define their own sharding implementation by setting the
1024-
`__tmp_hash` label during the target discovery with relabeling
1024+
`\__tmp_hash` label during the target discovery with relabeling
10251025
configuration (either in the monitoring resources or via scrape class).
10261026

10271027
You can also disable sharding on a specific target by setting the
@@ -1071,7 +1071,7 @@ the triple <key,value,effect> using the matching operator <operator>.
10711071

10721072
| `topologySpreadConstraints[]`
10731073
| `object`
1074-
|
1074+
|
10751075

10761076
| `tracingConfig`
10771077
| `object`
@@ -3144,7 +3144,7 @@ It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
31443144

31453145
| `proxyConnectHeader{}`
31463146
| `array`
3147-
|
3147+
|
31483148

31493149
| `proxyConnectHeader{}[]`
31503150
| `object`
@@ -4660,7 +4660,7 @@ Type::
46604660

46614661
| `deny`
46624662
| `boolean`
4663-
|
4663+
|
46644664

46654665
|===
46664666
=== .spec.containers
@@ -10538,7 +10538,7 @@ It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
1053810538

1053910539
| `proxyConnectHeader{}`
1054010540
| `array`
10541-
|
10541+
|
1054210542

1054310543
| `proxyConnectHeader{}[]`
1054410544
| `object`
@@ -10812,7 +10812,7 @@ It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
1081210812

1081310813
| `proxyConnectHeader{}`
1081410814
| `array`
10815-
|
10815+
|
1081610816

1081710817
| `proxyConnectHeader{}[]`
1081810818
| `object`
@@ -11821,7 +11821,7 @@ It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
1182111821

1182211822
| `proxyConnectHeader{}`
1182311823
| `array`
11824-
|
11824+
|
1182511825

1182611826
| `proxyConnectHeader{}[]`
1182711827
| `object`
@@ -12340,7 +12340,7 @@ It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
1234012340

1234112341
| `proxyConnectHeader{}`
1234212342
| `array`
12343-
|
12343+
|
1234412344

1234512345
| `proxyConnectHeader{}[]`
1234612346
| `object`
@@ -13911,7 +13911,7 @@ More info: https://prometheus.io/docs/prometheus/latest/configuration/configurat
1391113911
| Relabelings configures the relabeling rules to apply to all scrape targets.
1391213912

1391313913
The Operator automatically adds relabelings for a few standard Kubernetes fields
13914-
like `__meta_kubernetes_namespace` and `__meta_kubernetes_service_name`.
13914+
like `\__meta_kubernetes_namespace` and `\__meta_kubernetes_service_name`.
1391513915
Then the Operator adds the scrape class relabelings defined here.
1391613916
Then the Operator adds the target-specific relabelings defined in the scrape object.
1391713917

@@ -14124,7 +14124,7 @@ Description::
1412414124
Relabelings configures the relabeling rules to apply to all scrape targets.
1412514125

1412614126
The Operator automatically adds relabelings for a few standard Kubernetes fields
14127-
like `__meta_kubernetes_namespace` and `__meta_kubernetes_service_name`.
14127+
like `\__meta_kubernetes_namespace` and `\__meta_kubernetes_service_name`.
1412814128
Then the Operator adds the scrape class relabelings defined here.
1412914129
Then the Operator adds the target-specific relabelings defined in the scrape object.
1413014130

@@ -21599,7 +21599,7 @@ being performed. Only delete actions will be performed.
2159921599

2160021600
| `shardStatuses[]`
2160121601
| `object`
21602-
|
21602+
|
2160321603

2160421604
| `shards`
2160521605
| `integer`
@@ -21853,7 +21853,7 @@ Description::
2185321853
| Parameter | Type | Description
2185421854
| `body`
2185521855
| xref:../monitoring_apis/prometheus-monitoring-coreos-com-v1.adoc#prometheus-monitoring-coreos-com-v1[`Prometheus`] schema
21856-
|
21856+
|
2185721857
|===
2185821858

2185921859
.HTTP responses
@@ -21986,7 +21986,7 @@ Description::
2198621986
| Parameter | Type | Description
2198721987
| `body`
2198821988
| xref:../monitoring_apis/prometheus-monitoring-coreos-com-v1.adoc#prometheus-monitoring-coreos-com-v1[`Prometheus`] schema
21989-
|
21989+
|
2199021990
|===
2199121991

2199221992
.HTTP responses
@@ -22088,7 +22088,7 @@ Description::
2208822088
| Parameter | Type | Description
2208922089
| `body`
2209022090
| xref:../autoscale_apis/scale-autoscaling-v1.adoc#scale-autoscaling-v1[`Scale`] schema
22091-
|
22091+
|
2209222092
|===
2209322093

2209422094
.HTTP responses
@@ -22190,7 +22190,7 @@ Description::
2219022190
| Parameter | Type | Description
2219122191
| `body`
2219222192
| xref:../monitoring_apis/prometheus-monitoring-coreos-com-v1.adoc#prometheus-monitoring-coreos-com-v1[`Prometheus`] schema
22193-
|
22193+
|
2219422194
|===
2219522195

2219622196
.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
@@ -385,7 +385,7 @@ Cannot be set at the same time as `authorization`, or `basicAuth`.
385385

386386
| `params{}`
387387
| `array (string)`
388-
|
388+
|
389389

390390
| `path`
391391
| `string`
@@ -431,7 +431,7 @@ metadata labels.
431431

432432
The Operator automatically adds relabelings for a few standard Kubernetes fields.
433433

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

436436
More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config
437437

@@ -828,7 +828,7 @@ It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
828828

829829
| `proxyConnectHeader{}`
830830
| `array`
831-
|
831+
|
832832

833833
| `proxyConnectHeader{}[]`
834834
| `object`
@@ -1429,7 +1429,7 @@ metadata labels.
14291429

14301430
The Operator automatically adds relabelings for a few standard Kubernetes fields.
14311431

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

14341434
More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config
14351435
--
@@ -2177,7 +2177,7 @@ Description::
21772177
| Parameter | Type | Description
21782178
| `body`
21792179
| xref:../monitoring_apis/servicemonitor-monitoring-coreos-com-v1.adoc#servicemonitor-monitoring-coreos-com-v1[`ServiceMonitor`] schema
2180-
|
2180+
|
21812181
|===
21822182

21832183
.HTTP responses
@@ -2310,7 +2310,7 @@ Description::
23102310
| Parameter | Type | Description
23112311
| `body`
23122312
| xref:../monitoring_apis/servicemonitor-monitoring-coreos-com-v1.adoc#servicemonitor-monitoring-coreos-com-v1[`ServiceMonitor`] schema
2313-
|
2313+
|
23142314
|===
23152315

23162316
.HTTP responses

0 commit comments

Comments
 (0)