Add the ability to turn off adding metric suffixes when converting fr…

…om OpenTelemetry metrics to Prometheus metrics Signed-off-by: Pete Wall <[email protected]>
grafana · Nov 14, 2024 · 4cafa66 · 4cafa66
1 parent 5bdc1d2
commit 4cafa66
Show file tree

Hide file tree

Showing 141 changed files with 220 additions and 0 deletions.
diff --git a/charts/k8s-monitoring-v1/README.md b/charts/k8s-monitoring-v1/README.md
@@ -343,6 +343,13 @@ The Prometheus and Loki services may be hosted on the same cluster, or remotely
 | externalServices.prometheus.writeEndpoint | string | `"/api/prom/push"` | Prometheus metrics write endpoint. Preset for Grafana Cloud Metrics instances. |
 | externalServices.prometheus.writeRelabelConfigRules | string | `""` | Rule blocks to be added to the [write_relabel_config block](https://grafana.com/docs/alloy/latest/reference/components/prometheus/prometheus.remote_write/#write_relabel_config-block) of the prometheus.remote_write component. |
 
+### OpenTelemetry Conversion
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| externalServices.prometheus.openTelemetryConversion | object | `{"addMetricSuffixes":true}` | Settings for converting OpenTelemetry ecosystem metrics to Prometheus ecosystem metrics. |
+| externalServices.prometheus.openTelemetryConversion.addMetricSuffixes | bool | `true` | Whether to add type and unit suffixes to metrics names. |
+
 ### External Services (Pyroscope)
 
 | Key | Type | Default | Description |

diff --git a/charts/k8s-monitoring-v1/docs/examples/alloy-autoscaling-and-storage/metrics.alloy b/charts/k8s-monitoring-v1/docs/examples/alloy-autoscaling-and-storage/metrics.alloy
diff --git a/charts/k8s-monitoring-v1/docs/examples/alloy-autoscaling-and-storage/output.yaml b/charts/k8s-monitoring-v1/docs/examples/alloy-autoscaling-and-storage/output.yaml
diff --git a/charts/k8s-monitoring-v1/docs/examples/application-observability/metrics.alloy b/charts/k8s-monitoring-v1/docs/examples/application-observability/metrics.alloy
diff --git a/charts/k8s-monitoring-v1/docs/examples/application-observability/output.yaml b/charts/k8s-monitoring-v1/docs/examples/application-observability/output.yaml
diff --git a/charts/k8s-monitoring-v1/docs/examples/azure-aks/metrics.alloy b/charts/k8s-monitoring-v1/docs/examples/azure-aks/metrics.alloy
diff --git a/charts/k8s-monitoring-v1/docs/examples/azure-aks/output.yaml b/charts/k8s-monitoring-v1/docs/examples/azure-aks/output.yaml
diff --git a/charts/k8s-monitoring-v1/docs/examples/bearer-token-auth/metrics.alloy b/charts/k8s-monitoring-v1/docs/examples/bearer-token-auth/metrics.alloy
diff --git a/charts/k8s-monitoring-v1/docs/examples/bearer-token-auth/output.yaml b/charts/k8s-monitoring-v1/docs/examples/bearer-token-auth/output.yaml
diff --git a/charts/k8s-monitoring-v1/docs/examples/beyla/metrics.alloy b/charts/k8s-monitoring-v1/docs/examples/beyla/metrics.alloy
diff --git a/charts/k8s-monitoring-v1/docs/examples/beyla/output.yaml b/charts/k8s-monitoring-v1/docs/examples/beyla/output.yaml
diff --git a/charts/k8s-monitoring-v1/docs/examples/control-plane-metrics/metrics.alloy b/charts/k8s-monitoring-v1/docs/examples/control-plane-metrics/metrics.alloy
diff --git a/charts/k8s-monitoring-v1/docs/examples/control-plane-metrics/output.yaml b/charts/k8s-monitoring-v1/docs/examples/control-plane-metrics/output.yaml
diff --git a/charts/k8s-monitoring-v1/docs/examples/custom-config/metrics.alloy b/charts/k8s-monitoring-v1/docs/examples/custom-config/metrics.alloy
diff --git a/charts/k8s-monitoring-v1/docs/examples/custom-config/output.yaml b/charts/k8s-monitoring-v1/docs/examples/custom-config/output.yaml
diff --git a/charts/k8s-monitoring-v1/docs/examples/custom-metrics-tuning/metrics.alloy b/charts/k8s-monitoring-v1/docs/examples/custom-metrics-tuning/metrics.alloy
diff --git a/charts/k8s-monitoring-v1/docs/examples/custom-metrics-tuning/output.yaml b/charts/k8s-monitoring-v1/docs/examples/custom-metrics-tuning/output.yaml
diff --git a/charts/k8s-monitoring-v1/docs/examples/custom-pricing/metrics.alloy b/charts/k8s-monitoring-v1/docs/examples/custom-pricing/metrics.alloy
diff --git a/charts/k8s-monitoring-v1/docs/examples/custom-pricing/output.yaml b/charts/k8s-monitoring-v1/docs/examples/custom-pricing/output.yaml
diff --git a/charts/k8s-monitoring-v1/docs/examples/custom-prometheus-operator-rules/metrics.alloy b/charts/k8s-monitoring-v1/docs/examples/custom-prometheus-operator-rules/metrics.alloy
diff --git a/charts/k8s-monitoring-v1/docs/examples/custom-prometheus-operator-rules/output.yaml b/charts/k8s-monitoring-v1/docs/examples/custom-prometheus-operator-rules/output.yaml
diff --git a/charts/k8s-monitoring-v1/docs/examples/default-values/metrics.alloy b/charts/k8s-monitoring-v1/docs/examples/default-values/metrics.alloy
diff --git a/charts/k8s-monitoring-v1/docs/examples/default-values/output.yaml b/charts/k8s-monitoring-v1/docs/examples/default-values/output.yaml
diff --git a/charts/k8s-monitoring-v1/docs/examples/eks-fargate/metrics.alloy b/charts/k8s-monitoring-v1/docs/examples/eks-fargate/metrics.alloy
diff --git a/charts/k8s-monitoring-v1/docs/examples/eks-fargate/output.yaml b/charts/k8s-monitoring-v1/docs/examples/eks-fargate/output.yaml
diff --git a/charts/k8s-monitoring-v1/docs/examples/environment-variables/metrics.alloy b/charts/k8s-monitoring-v1/docs/examples/environment-variables/metrics.alloy
diff --git a/charts/k8s-monitoring-v1/docs/examples/environment-variables/output.yaml b/charts/k8s-monitoring-v1/docs/examples/environment-variables/output.yaml
diff --git a/charts/k8s-monitoring-v1/docs/examples/external-secrets/metrics.alloy b/charts/k8s-monitoring-v1/docs/examples/external-secrets/metrics.alloy
diff --git a/charts/k8s-monitoring-v1/docs/examples/external-secrets/output.yaml b/charts/k8s-monitoring-v1/docs/examples/external-secrets/output.yaml
diff --git a/charts/k8s-monitoring-v1/docs/examples/extra-rules/metrics.alloy b/charts/k8s-monitoring-v1/docs/examples/extra-rules/metrics.alloy
diff --git a/charts/k8s-monitoring-v1/docs/examples/extra-rules/output.yaml b/charts/k8s-monitoring-v1/docs/examples/extra-rules/output.yaml
diff --git a/charts/k8s-monitoring-v1/docs/examples/gke-autopilot/metrics.alloy b/charts/k8s-monitoring-v1/docs/examples/gke-autopilot/metrics.alloy
diff --git a/charts/k8s-monitoring-v1/docs/examples/gke-autopilot/output.yaml b/charts/k8s-monitoring-v1/docs/examples/gke-autopilot/output.yaml