Skip to content

Commit 5fcc706

Browse files
petewallpetewall
committed
Fix the type of endpoint params
Signed-off-by: Pete Wall <pete.wall@grafana.com>
1 parent 0cea4a3 commit 5fcc706

21 files changed

+5434
-24
lines changed

‎charts/k8s-monitoring/destinations/loki-values.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ auth:
9494
# -- Raw config for accessing the client ID
9595
# @section -- Authentication - OAuth2
9696
clientIdFrom: ""
97-
# -- Prometheus OAuth2 client secret
97+
# -- OAuth2 client secret
9898
# @section -- Authentication - OAuth2
9999
clientSecret: ""
100100
# -- The key for the client secret property in the secret
@@ -106,7 +106,7 @@ auth:
106106
# -- File containing the OAuth2 client secret.
107107
# @section -- Authentication - OAuth2
108108
clientSecretFile: ""
109-
# -- Prometheus OAuth2 endpoint parameters
109+
# -- OAuth2 endpoint parameters
110110
# @section -- Authentication - OAuth2
111111
endpointParams: {}
112112
# -- HTTP proxy to send requests through.

‎charts/k8s-monitoring/destinations/otlp-values.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ auth:
104104
# -- Raw config for accessing the client ID
105105
# @section -- Authentication - OAuth2
106106
clientIdFrom: ""
107-
# -- Prometheus OAuth2 client secret
107+
# -- OAuth2 client secret
108108
# @section -- Authentication - OAuth2
109109
clientSecret: ""
110110
# -- The key for the client secret property in the secret
@@ -116,7 +116,7 @@ auth:
116116
# -- File containing the OAuth2 client secret.
117117
# @section -- Authentication - OAuth2
118118
clientSecretFile: ""
119-
# -- Prometheus OAuth2 endpoint parameters
119+
# -- OAuth2 endpoint parameters
120120
# @section -- Authentication - OAuth2
121121
endpointParams: {}
122122
# -- HTTP proxy to send requests through.

‎charts/k8s-monitoring/destinations/prometheus-values.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ auth:
103103
# -- Raw config for accessing the client ID
104104
# @section -- Authentication - OAuth2
105105
clientIdFrom: ""
106-
# -- Prometheus OAuth2 client secret
106+
# -- OAuth2 client secret
107107
# @section -- Authentication - OAuth2
108108
clientSecret: ""
109109
# -- The key for the client secret property in the secret
@@ -115,7 +115,7 @@ auth:
115115
# -- File containing the OAuth2 client secret.
116116
# @section -- Authentication - OAuth2
117117
clientSecretFile: ""
118-
# -- Prometheus OAuth2 endpoint parameters
118+
# -- OAuth2 endpoint parameters
119119
# @section -- Authentication - OAuth2
120120
endpointParams: {}
121121
# -- HTTP proxy to send requests through.

‎charts/k8s-monitoring/destinations/pyroscope-values.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ auth:
8282
# -- Raw config for accessing the client ID
8383
# @section -- Authentication - OAuth2
8484
clientIdFrom: ""
85-
# -- Prometheus OAuth2 client secret
85+
# -- OAuth2 client secret
8686
# @section -- Authentication - OAuth2
8787
clientSecret: ""
8888
# -- The key for the client secret property in the secret
@@ -94,7 +94,7 @@ auth:
9494
# -- File containing the OAuth2 client secret.
9595
# @section -- Authentication - OAuth2
9696
clientSecretFile: ""
97-
# -- Prometheus OAuth2 endpoint parameters
97+
# -- OAuth2 endpoint parameters
9898
# @section -- Authentication - OAuth2
9999
endpointParams: {}
100100
# -- HTTP proxy to send requests through.

‎charts/k8s-monitoring/docs/destinations/loki.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ This defines the options for defining a destination for logs that use the Loki p
2020
| auth.oauth2.clientId | string | `""` | OAuth2 client ID |
2121
| auth.oauth2.clientIdFrom | string | `""` | Raw config for accessing the client ID |
2222
| auth.oauth2.clientIdKey | string | `"clientId"` | The key for the client ID property in the secret |
23-
| auth.oauth2.clientSecret | string | `""` | Prometheus OAuth2 client secret |
23+
| auth.oauth2.clientSecret | string | `""` | OAuth2 client secret |
2424
| auth.oauth2.clientSecretFile | string | `""` | File containing the OAuth2 client secret. |
2525
| auth.oauth2.clientSecretFrom | string | `""` | Raw config for accessing the client secret |
2626
| auth.oauth2.clientSecretKey | string | `"clientSecret"` | The key for the client secret property in the secret |
27-
| auth.oauth2.endpointParams | object | `{}` | Prometheus OAuth2 endpoint parameters |
27+
| auth.oauth2.endpointParams | object | `{}` | OAuth2 endpoint parameters |
2828
| auth.oauth2.noProxy | string | `""` | Comma-separated list of IP addresses, CIDR notations, and domain names to exclude from proxying. |
2929
| auth.oauth2.proxyConnectHeader | object | `{}` | Specifies headers to send to proxies during CONNECT requests. |
3030
| auth.oauth2.proxyFromEnvironment | bool | `false` | Use the proxy URL indicated by environment variables. |

‎charts/k8s-monitoring/docs/destinations/otlp.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ This defines the options for defining a destination for OpenTelemetry data that
2020
| auth.oauth2.clientId | string | `""` | OAuth2 client ID |
2121
| auth.oauth2.clientIdFrom | string | `""` | Raw config for accessing the client ID |
2222
| auth.oauth2.clientIdKey | string | `"clientId"` | The key for the client ID property in the secret |
23-
| auth.oauth2.clientSecret | string | `""` | Prometheus OAuth2 client secret |
23+
| auth.oauth2.clientSecret | string | `""` | OAuth2 client secret |
2424
| auth.oauth2.clientSecretFile | string | `""` | File containing the OAuth2 client secret. |
2525
| auth.oauth2.clientSecretFrom | string | `""` | Raw config for accessing the client secret |
2626
| auth.oauth2.clientSecretKey | string | `"clientSecret"` | The key for the client secret property in the secret |
27-
| auth.oauth2.endpointParams | object | `{}` | Prometheus OAuth2 endpoint parameters |
27+
| auth.oauth2.endpointParams | object | `{}` | OAuth2 endpoint parameters |
2828
| auth.oauth2.noProxy | string | `""` | Comma-separated list of IP addresses, CIDR notations, and domain names to exclude from proxying. |
2929
| auth.oauth2.proxyConnectHeader | object | `{}` | Specifies headers to send to proxies during CONNECT requests. |
3030
| auth.oauth2.proxyFromEnvironment | bool | `false` | Use the proxy URL indicated by environment variables. |

‎charts/k8s-monitoring/docs/destinations/prometheus.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ This defines the options for defining a destination for metrics that use the Pro
2020
| auth.oauth2.clientId | string | `""` | OAuth2 client ID |
2121
| auth.oauth2.clientIdFrom | string | `""` | Raw config for accessing the client ID |
2222
| auth.oauth2.clientIdKey | string | `"clientId"` | The key for the client ID property in the secret |
23-
| auth.oauth2.clientSecret | string | `""` | Prometheus OAuth2 client secret |
23+
| auth.oauth2.clientSecret | string | `""` | OAuth2 client secret |
2424
| auth.oauth2.clientSecretFile | string | `""` | File containing the OAuth2 client secret. |
2525
| auth.oauth2.clientSecretFrom | string | `""` | Raw config for accessing the client secret |
2626
| auth.oauth2.clientSecretKey | string | `"clientSecret"` | The key for the client secret property in the secret |
27-
| auth.oauth2.endpointParams | object | `{}` | Prometheus OAuth2 endpoint parameters |
27+
| auth.oauth2.endpointParams | object | `{}` | OAuth2 endpoint parameters |
2828
| auth.oauth2.noProxy | string | `""` | Comma-separated list of IP addresses, CIDR notations, and domain names to exclude from proxying. |
2929
| auth.oauth2.proxyConnectHeader | object | `{}` | Specifies headers to send to proxies during CONNECT requests. |
3030
| auth.oauth2.proxyFromEnvironment | bool | `false` | Use the proxy URL indicated by environment variables. |

‎charts/k8s-monitoring/docs/destinations/pyroscope.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ This defines the options for defining a destination for profiles that use the Py
1919
| auth.oauth2.clientId | string | `""` | OAuth2 client ID |
2020
| auth.oauth2.clientIdFrom | string | `""` | Raw config for accessing the client ID |
2121
| auth.oauth2.clientIdKey | string | `"clientId"` | The key for the client ID property in the secret |
22-
| auth.oauth2.clientSecret | string | `""` | Prometheus OAuth2 client secret |
22+
| auth.oauth2.clientSecret | string | `""` | OAuth2 client secret |
2323
| auth.oauth2.clientSecretFile | string | `""` | File containing the OAuth2 client secret. |
2424
| auth.oauth2.clientSecretFrom | string | `""` | Raw config for accessing the client secret |
2525
| auth.oauth2.clientSecretKey | string | `"clientSecret"` | The key for the client secret property in the secret |
26-
| auth.oauth2.endpointParams | object | `{}` | Prometheus OAuth2 endpoint parameters |
26+
| auth.oauth2.endpointParams | object | `{}` | OAuth2 endpoint parameters |
2727
| auth.oauth2.noProxy | string | `""` | Comma-separated list of IP addresses, CIDR notations, and domain names to exclude from proxying. |
2828
| auth.oauth2.proxyConnectHeader | object | `{}` | Specifies headers to send to proxies during CONNECT requests. |
2929
| auth.oauth2.proxyFromEnvironment | bool | `false` | Use the proxy URL indicated by environment variables. |

‎charts/k8s-monitoring/docs/examples/auth/oauth2/README.md

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
<!--
2+
(NOTE: Do not edit README.md directly. It is a generated file!)
3+
( To make changes, please modify values.yaml or description.txt and run `make examples`)
4+
-->
5+
# OAuth2 Authentication
6+
7+
This example demonstrates how to use OAuth2 for authentication.
8+
9+
## Values
10+
11+
```yaml
12+
cluster:
13+
name: oauth2-auth-example
14+
15+
destinations:
16+
- name: otel-endpoint
17+
type: otlp
18+
url: "grpc.my.otel.endpoint:443"
19+
auth:
20+
type: oauth2
21+
oauth2:
22+
tokenURL: "https://my.idp/application/o/token/"
23+
clientId: "my-client-id"
24+
clientSecretFile: "/var/run/secrets/kubernetes.io/serviceaccount/token"
25+
endpointParams:
26+
grant_type: ["client_credentials"]
27+
client_assertion_type: ["urn:ietf:params:oauth:client-assertion-type:jwt-bearer"]
28+
logs: {enabled: true}
29+
metrics: {enabled: true}
30+
traces: {enabled: true}
31+
32+
clusterMetrics:
33+
enabled: true
34+
35+
clusterEvents:
36+
enabled: true
37+
38+
podLogs:
39+
enabled: true
40+
41+
nodeLogs:
42+
enabled: true
43+
44+
prometheusOperatorObjects:
45+
enabled: true
46+
47+
annotationAutodiscovery:
48+
enabled: true
49+
50+
alloy-logs:
51+
enabled: true
52+
alloy-metrics:
53+
enabled: true
54+
alloy-singleton:
55+
enabled: true
56+
```

0 commit comments

Comments
 (0)