sync from upstream

giantswarm · Oct 29, 2024 · 7437d61 · 7437d61
1 parent b3fdf08
commit 7437d61
Show file tree

Hide file tree

Showing 27 changed files with 907 additions and 2,137 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Resync alloy, loki and mimir mixins from upstream.
+
 ## [3.25.0] - 2024-10-14
 
 ### Added

diff --git a/Makefile.custom.mk b/Makefile.custom.mk
@@ -13,7 +13,7 @@ update-alertmanager-mixin: ##   Update Alertmanager mixin dashboards
 	./scripts/update-monitoring-mixin-dashboards.sh
 
 update-alloy-mixin: install-tools ##        Update Alloy mixin dashboards
-	./alloy/update-alloy-mixin.sh
+	./alloy/update.sh
 
 update-kubernetes-mixin: ##     Update Kubernetes mixin dashboards
 	./scripts/sync-kube-mixin.sh

diff --git a/alloy/update-alloy-mixin.sh → alloy/update.sh b/alloy/update-alloy-mixin.sh → alloy/update.sh
@@ -5,7 +5,7 @@
 # This script updates the Alloy mixin dashboards from the upstream repository.
 #
 # Usage:
-#   ./update-alloy-mixin.sh
+#   ./update.sh
 
 set -eu
 

diff --git a/...ashboards/charts/private_dashboards_al/dashboards/shared/private/alloy-opentelemetry.json b/...ashboards/charts/private_dashboards_al/dashboards/shared/private/alloy-opentelemetry.json
@@ -49,7 +49,7 @@
       "targets": [
         {
           "datasource": "${datasource}",
-          "expr": "rate(receiver_accepted_spans_ratio_total{cluster=~\"$cluster\", namespace=~\"$namespace\", job=~\"$job\", instance=~\"$instance\"}[$__rate_interval])\n",
+          "expr": "rate(otelcol_receiver_accepted_spans_total{cluster=~\"$cluster\", namespace=~\"$namespace\", job=~\"$job\", instance=~\"$instance\"}[$__rate_interval])\n",
           "instant": false,
           "legendFormat": "{{ pod }} / {{ transport }}",
           "range": true
@@ -81,7 +81,7 @@
       "targets": [
         {
           "datasource": "${datasource}",
-          "expr": "rate(receiver_refused_spans_ratio_total{cluster=~\"$cluster\", namespace=~\"$namespace\", job=~\"$job\", instance=~\"$instance\"}[$__rate_interval])\n",
+          "expr": "rate(otelcol_receiver_refused_spans_total{cluster=~\"$cluster\", namespace=~\"$namespace\", job=~\"$job\", instance=~\"$instance\"}[$__rate_interval])\n",
           "instant": false,
           "legendFormat": "{{ pod }} / {{ transport }}",
           "range": true
@@ -192,7 +192,7 @@
       "targets": [
         {
           "datasource": "${datasource}",
-          "expr": "sum by (le) (increase(processor_batch_batch_send_size_ratio_bucket{cluster=~\"$cluster\", namespace=~\"$namespace\", job=~\"$job\", instance=~\"$instance\"}[$__rate_interval]))\n",
+          "expr": "sum by (le) (increase(otelcol_processor_batch_batch_send_size_bucket{cluster=~\"$cluster\", namespace=~\"$namespace\", job=~\"$job\", instance=~\"$instance\"}[$__rate_interval]))\n",
           "format": "heatmap",
           "instant": false,
           "legendFormat": "{{le}}",
@@ -214,7 +214,7 @@
       "targets": [
         {
           "datasource": "${datasource}",
-          "expr": "processor_batch_metadata_cardinality_ratio{cluster=~\"$cluster\", namespace=~\"$namespace\", job=~\"$job\", instance=~\"$instance\"}\n",
+          "expr": "otelcol_processor_batch_metadata_cardinality{cluster=~\"$cluster\", namespace=~\"$namespace\", job=~\"$job\", instance=~\"$instance\"}\n",
           "instant": false,
           "legendFormat": "{{ pod }}",
           "range": true
@@ -235,7 +235,7 @@
       "targets": [
         {
           "datasource": "${datasource}",
-          "expr": "rate(processor_batch_timeout_trigger_send_ratio_total{cluster=~\"$cluster\", namespace=~\"$namespace\", job=~\"$job\", instance=~\"$instance\"}[$__rate_interval])\n",
+          "expr": "rate(otelcol_processor_batch_timeout_trigger_send_total{cluster=~\"$cluster\", namespace=~\"$namespace\", job=~\"$job\", instance=~\"$instance\"}[$__rate_interval])\n",
           "instant": false,
           "legendFormat": "{{ pod }}",
           "range": true
@@ -278,7 +278,7 @@
       "targets": [
         {
           "datasource": "${datasource}",
-          "expr": "rate(exporter_sent_spans_ratio_total{cluster=~\"$cluster\", namespace=~\"$namespace\", job=~\"$job\", instance=~\"$instance\"}[$__rate_interval])\n",
+          "expr": "rate(otelcol_exporter_sent_spans_total{cluster=~\"$cluster\", namespace=~\"$namespace\", job=~\"$job\", instance=~\"$instance\"}[$__rate_interval])\n",
           "instant": false,
           "legendFormat": "{{ pod }}",
           "range": true
@@ -310,7 +310,7 @@
       "targets": [
         {
           "datasource": "${datasource}",
-          "expr": "rate(exporter_send_failed_spans_ratio_total{cluster=~\"$cluster\", namespace=~\"$namespace\", job=~\"$job\", instance=~\"$instance\"}[$__rate_interval])\n",
+          "expr": "rate(otelcol_exporter_send_failed_spans_total{cluster=~\"$cluster\", namespace=~\"$namespace\", job=~\"$job\", instance=~\"$instance\"}[$__rate_interval])\n",
           "instant": false,
           "legendFormat": "{{ pod }}",
           "range": true