Remote traces.extraConfig... we'll deal with extraConfigs later

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

charts/k8s-monitoring/README.md

@@ -316,11 +316,11 @@ The Prometheus and Loki services may be hosted on the same cluster, or remotely
 | externalServices.tempo.tls | object | `{}` | [TLS settings](https://grafana.com/docs/alloy/latest/reference/components/otelcol.exporter.otlp/#tls-block) to configure for the traces service. |
 | externalServices.tempo.tlsOptions | string | `""` | Define the [TLS block](https://grafana.com/docs/alloy/latest/reference/components/otelcol.exporter.otlp/#tls-block). Example: `tlsOptions: insecure = true` This option will be deprecated and removed soon. Please switch to `tls` and use yaml format. |
 
-### Metrics Global
+### Metrics
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| extraConfig | deprecated | `""` | Use metrics.extraConfig instead. |
+| extraConfig | string | `""` | Extra configuration that will be added to the Grafana Alloy configuration file. This value is templated so that you can refer to other values from this file. This cannot be used to modify the generated configuration values, only append new components. See [Adding custom Flow configuration](#adding-custom-flow-configuration) for an example. |
 
 ### Chart
 
@@ -796,12 +796,6 @@ The Prometheus and Loki services may be hosted on the same cluster, or remotely
 | traces.receiver.filters | object | `{"span":[],"spanevent":[]}` | Apply a filter to traces received via the OTLP or OTLP HTTP receivers. ([docs](https://grafana.com/docs/alloy/latest/reference/components/otelcol.processor.filter/)) |
 | traces.receiver.transforms | object | `{"resource":[],"span":[],"spanevent":[]}` | Apply a transformation to traces received via the OTLP or OTLP HTTP receivers. ([docs](https://grafana.com/docs/alloy/latest/reference/components/otelcol.processor.transform/)) |
 
-### Traces Global
-
-| Key | Type | Default | Description |
-|-----|------|---------|-------------|
-| traces.extraConfig | string | `""` | Extra configuration that will be added to the Grafana Alloy for Traces configuration file. This value is templated so that you can refer to other values from this file. This cannot be used to modify the generated configuration values, only append new components. See [Adding custom Flow configuration](#adding-custom-flow-configuration) for an example. |
-
 ### Other Values
 
 | Key | Type | Default | Description |

charts/k8s-monitoring/templates/_configs.tpl

@@ -99,10 +99,6 @@
 
   {{- if and .Values.traces.enabled }}
     {{- include "alloy.config.tracesService" . }}
-
-    {{- if .Values.traces.extraConfig }}
-      {{- tpl .Values.traces.extraConfig $ | indent 0 }}
-    {{- end }}
   {{- end }}
 
   {{- include "alloy.config.logging" .Values.alloy.logging}}

charts/k8s-monitoring/values.yaml

@@ -1316,7 +1316,7 @@ metrics:
     enabled: true
 
   # Alloy Modules
-  # Modules can be invoked using metrics.extraConfig, this block is consuming opinionated modules from the grafana/alloy-modules repository
+  # Modules can be invoked using extraConfig, this block is consuming opinionated modules from the grafana/alloy-modules repository
   # or any other repository that follows the same module structure.  Each module is expected to have a "kubernetes" module and a "scrape" module.
   alloyModules:
     # -- List of connection configurations used by modules.  Configures the import.git component
@@ -1589,13 +1589,6 @@ traces:
       # @section -- Traces
       spanevent: []
 
-  # -- Extra configuration that will be added to the Grafana Alloy for Traces configuration file.
-  # This value is templated so that you can refer to other values from this file.
-  # This cannot be used to modify the generated configuration values, only append new components.
-  # See [Adding custom Flow configuration](#adding-custom-flow-configuration) for an example.
-  # @section -- Traces Global
-  extraConfig: ""
-
 # Settings related to capturing and forwarding profiles
 profiles:
   # -- Receive and forward profiles.
@@ -1831,8 +1824,11 @@ receivers:
   # @section -- OTEL Receivers
   deployGrafanaAgentService: true
 
-# -- (deprecated) Use metrics.extraConfig instead.
-# @section -- Metrics Global
+# -- Extra configuration that will be added to the Grafana Alloy configuration file.
+# This value is templated so that you can refer to other values from this file.
+# This cannot be used to modify the generated configuration values, only append new components.
+# See [Adding custom Flow configuration](#adding-custom-flow-configuration) for an example.
+# @section -- Metrics
 extraConfig: ""
 
 # Setting for the config validator job, run as a pre-install and pre-upgrade hook to validate that the generated