Skip to content

Commit

Permalink
standardizing on camelCase and add the bearer token file option (#1010)
Browse files Browse the repository at this point in the history
* standardizing on camelCase and add the bearer token file option

Signed-off-by: Pete Wall <[email protected]>

* Update generated files

Signed-off-by: Pete Wall <[email protected]>

---------

Signed-off-by: Pete Wall <[email protected]>
  • Loading branch information
petewall authored Dec 18, 2024
1 parent 1418730 commit 3b92f78
Show file tree
Hide file tree
Showing 44 changed files with 120 additions and 73 deletions.
8 changes: 4 additions & 4 deletions charts/feature-application-observability/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ Be sure perform actual integration testing in a live environment in the main [k8
| Key | Type | Default | Description |
|-----|------|---------|-------------|
| receivers.jaeger.grpc | object | `{"enabled":false,"port":14250}` | Configuration for the Jaeger receiver using the gRPC protocol. |
| receivers.jaeger.include_debug_metrics | bool | `false` | Whether to include high-cardinality debug metrics. |
| receivers.jaeger.includeDebugMetrics | bool | `false` | Whether to include high-cardinality debug metrics. |
| receivers.jaeger.thriftBinary | object | `{"enabled":false,"port":6832}` | Configuration for the Jaeger receiver using the Thrift binary protocol. |
| receivers.jaeger.thriftCompact | object | `{"enabled":false,"port":6831}` | Configuration for the Jaeger receiver using the Thrift compact protocol. |
| receivers.jaeger.thriftHttp | object | `{"enabled":false,"port":14268}` | Configuration for the Jaeger receiver using the Thrift HTTP protocol. |
Expand All @@ -93,14 +93,14 @@ Be sure perform actual integration testing in a live environment in the main [k8
|-----|------|---------|-------------|
| receivers.otlp.grpc | object | `{"enabled":false,"port":4317}` | The OTLP gRPC receiver configuration. |
| receivers.otlp.http | object | `{"enabled":false,"port":4318}` | The OTLP HTTP receiver configuration. |
| receivers.otlp.include_debug_metrics | bool | `false` | Whether to include high-cardinality debug metrics. |
| receivers.otlp.includeDebugMetrics | bool | `false` | Whether to include high-cardinality debug metrics. |

### Receivers: Zipkin

| Key | Type | Default | Description |
|-----|------|---------|-------------|
| receivers.zipkin | object | `{"enabled":false,"include_debug_metrics":false,"port":9411}` | The Zipkin receiver configuration. |
| receivers.zipkin.include_debug_metrics | bool | `false` | Whether to include high-cardinality debug metrics. |
| receivers.zipkin | object | `{"enabled":false,"includeDebugMetrics":false,"port":9411}` | The Zipkin receiver configuration. |
| receivers.zipkin.includeDebugMetrics | bool | `false` | Whether to include high-cardinality debug metrics. |

### Other Values

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ otelcol.receiver.jaeger "receiver" {
}

debug_metrics {
disable_high_cardinality_metrics = {{ not .Values.receivers.jaeger.include_debug_metrics }}
disable_high_cardinality_metrics = {{ not .Values.receivers.jaeger.includeDebugMetrics }}
}
output {
{{- if and .tracesOutput .Values.traces.enabled }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ otelcol.receiver.otlp "receiver" {
}
{{- end }}
debug_metrics {
disable_high_cardinality_metrics = {{ not .Values.receivers.otlp.include_debug_metrics }}
disable_high_cardinality_metrics = {{ not .Values.receivers.otlp.includeDebugMetrics }}
}
output {
{{- if and .metricsOutput .Values.metrics.enabled }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
otelcol.receiver.zipkin "receiver" {
endpoint = "0.0.0.0:{{ .Values.receivers.zipkin.port | int }}"
debug_metrics {
disable_high_cardinality_metrics = {{ not .Values.receivers.zipkin.include_debug_metrics }}
disable_high_cardinality_metrics = {{ not .Values.receivers.zipkin.includeDebugMetrics }}
}
output {
{{- if and .tracesOutput .Values.traces.enabled }}
Expand Down
6 changes: 3 additions & 3 deletions charts/feature-application-observability/values.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
}
}
},
"include_debug_metrics": {
"includeDebugMetrics": {
"type": "boolean"
},
"thriftBinary": {
Expand Down Expand Up @@ -215,7 +215,7 @@
}
}
},
"include_debug_metrics": {
"includeDebugMetrics": {
"type": "boolean"
}
}
Expand All @@ -226,7 +226,7 @@
"enabled": {
"type": "boolean"
},
"include_debug_metrics": {
"includeDebugMetrics": {
"type": "boolean"
},
"port": {
Expand Down
6 changes: 3 additions & 3 deletions charts/feature-application-observability/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ receivers:

# -- Whether to include high-cardinality debug metrics.
# @section -- Receivers: OTLP
include_debug_metrics: false
includeDebugMetrics: false

jaeger:
# -- Configuration for the Jaeger receiver using the gRPC protocol.
Expand Down Expand Up @@ -52,7 +52,7 @@ receivers:

# -- Whether to include high-cardinality debug metrics.
# @section -- Receivers: Jaeger
include_debug_metrics: false
includeDebugMetrics: false

# -- The Zipkin receiver configuration.
# @section -- Receivers: Zipkin
Expand All @@ -62,7 +62,7 @@ receivers:

# -- Whether to include high-cardinality debug metrics.
# @section -- Receivers: Zipkin
include_debug_metrics: false
includeDebugMetrics: false

processors:
grafanaCloudMetrics:
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
3 changes: 3 additions & 0 deletions charts/k8s-monitoring/destinations/loki-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,9 @@ auth:
# -- Raw config for accessing the bearer token.
# @section -- Authentication - Bearer Token
bearerTokenFrom: ""
# -- Path to a file that containers the bearer token.
# @section -- Authentication - Bearer Token
bearerTokenFile: ""

# Authenticate to Loki using OAuth2
# @section -- Authentication - OAuth2
Expand Down
3 changes: 3 additions & 0 deletions charts/k8s-monitoring/destinations/otlp-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,9 @@ auth:
# -- Raw config for accessing the bearer token.
# @section -- Authentication - Bearer Token
bearerTokenFrom: ""
# -- Path to a file that containers the bearer token.
# @section -- Authentication - Bearer Token
bearerTokenFile: ""

# Authenticate to Prometheus using OAuth2
# @section -- Authentication - OAuth2
Expand Down
3 changes: 3 additions & 0 deletions charts/k8s-monitoring/destinations/prometheus-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,9 @@ auth:
# -- Raw config for accessing the bearer token.
# @section -- Authentication - Bearer Token
bearerTokenFrom: ""
# -- Path to a file that containers the bearer token.
# @section -- Authentication - Bearer Token
bearerTokenFile: ""

# Authenticate to Prometheus using OAuth2
# @section -- Authentication - OAuth2
Expand Down
1 change: 1 addition & 0 deletions charts/k8s-monitoring/docs/destinations/loki.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ This defines the options for defining a destination for logs that use the Loki p
| Key | Type | Default | Description |
|-----|------|---------|-------------|
| auth.bearerToken | string | `""` | The bearer token for bearer token authentication. |
| auth.bearerTokenFile | string | `""` | Path to a file that containers the bearer token. |
| auth.bearerTokenFrom | string | `""` | Raw config for accessing the bearer token. |
| auth.bearerTokenKey | string | `"bearerToken"` | The key for storing the bearer token in the secret. |

Expand Down
1 change: 1 addition & 0 deletions charts/k8s-monitoring/docs/destinations/otlp.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ This defines the options for defining a destination for OpenTelemetry data that
| Key | Type | Default | Description |
|-----|------|---------|-------------|
| auth.bearerToken | string | `""` | The bearer token for bearer token authentication. |
| auth.bearerTokenFile | string | `""` | Path to a file that containers the bearer token. |
| auth.bearerTokenFrom | string | `""` | Raw config for accessing the bearer token. |
| auth.bearerTokenKey | string | `"bearerToken"` | The key for storing the bearer token in the secret. |

Expand Down
1 change: 1 addition & 0 deletions charts/k8s-monitoring/docs/destinations/prometheus.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ This defines the options for defining a destination for metrics that use the Pro
| Key | Type | Default | Description |
|-----|------|---------|-------------|
| auth.bearerToken | string | `""` | The bearer token for bearer token authentication. |
| auth.bearerTokenFile | string | `""` | Path to a file that containers the bearer token. |
| auth.bearerTokenFrom | string | `""` | Raw config for accessing the bearer token. |
| auth.bearerTokenKey | string | `"bearerToken"` | The key for storing the bearer token in the secret. |

Expand Down
8 changes: 4 additions & 4 deletions charts/k8s-monitoring/docs/examples/auth/sigv4/output.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions charts/k8s-monitoring/docs/examples/autoscaling/output.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions charts/k8s-monitoring/docs/examples/extra-rules/output.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 3b92f78

Please sign in to comment.