Merge branch 'master' into java_micrometer_with_suffixes

grafana · Dec 10, 2024 · 6ea8762 · 6ea8762
2 parents b4dc84d + 560e361
commit 6ea8762
Show file tree

Hide file tree

Showing 44 changed files with 1,497 additions and 599 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
         with:
-          go-version: 1.18
+          go-version: 1.23
       - name: Install CI dependencies
         run: make install-ci-deps
       - name: Lint and Format
@@ -33,7 +33,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
         with:
-          go-version: 1.18
+          go-version: 1.23
       - name: Install CI dependencies
         run: make install-ci-deps
       - name: Run Tests

diff --git a/.github/workflows/lint-mixins.yml b/.github/workflows/lint-mixins.yml
@@ -25,7 +25,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.18
+          go-version: 1.23
 
       - name: Install CI dependencies
         run: make install-ci-deps
@@ -68,7 +68,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.18
+          go-version: 1.23
 
       - name: Install CI dependencies
         run: make install-ci-deps

diff --git a/Makefile b/Makefile
@@ -5,7 +5,7 @@ install-ci-deps:
 	go install github.com/google/go-jsonnet/cmd/[email protected]
 	go install github.com/google/go-jsonnet/cmd/[email protected]
 	go install github.com/google/go-jsonnet/cmd/[email protected]
-	go install github.com/monitoring-mixins/mixtool/cmd/mixtool@a9e78b0942a4186162bf170efde7b4b3167d31a4
+	go install github.com/monitoring-mixins/mixtool/cmd/mixtool@a8984473edc33da685bd5f2138eab9cf6a0ff2b7
 	go install github.com/jsonnet-bundler/jsonnet-bundler/cmd/[email protected]
 
 fmt:

diff --git a/apache-solr-mixin/dashboards/apache-solr-cluster-overview.libsonnet b/apache-solr-mixin/dashboards/apache-solr-cluster-overview.libsonnet
@@ -1653,7 +1653,7 @@ local getMatcher(cfg) = '%(solrSelector)s, solr_cluster=~"$solr_cluster"' % cfg;
             refresh=2,
             includeAll=true,
             multi=true,
-            allValues='.+',
+            allValues='.*',
             sort=1
           ),
           template.new(

diff --git a/apache-solr-mixin/dashboards/apache-solr-query-performance.libsonnet b/apache-solr-mixin/dashboards/apache-solr-query-performance.libsonnet
@@ -1578,7 +1578,7 @@ local getMatcher(cfg) = '%(solrSelector)s, solr_cluster=~"$solr_cluster", base_u
             refresh=2,
             includeAll=true,
             multi=true,
-            allValues='.+',
+            allValues='.*',
             sort=1
           ),
           template.new(

diff --git a/apache-solr-mixin/dashboards/apache-solr-resource-monitoring.libsonnet b/apache-solr-mixin/dashboards/apache-solr-resource-monitoring.libsonnet
@@ -1059,7 +1059,7 @@ local dispatchesPanel(matcher) = {
   },
 };
 
-local getMatcher(cfg) = '%(solrSelector)s, solr_cluster="$solr_cluster", base_url=~"$base_url"' % cfg;
+local getMatcher(cfg) = '%(solrSelector)s, solr_cluster=~"$solr_cluster", base_url=~"$base_url"' % cfg;
 
 {
   grafanaDashboards+:: {
-Original file line number
+Diff line change
@@ Expand Up / @@ -1059,7 +1059,7 @@ local dispatchesPanel(matcher) = { @@
       },
     };
-    local getMatcher(cfg) = '%(solrSelector)s, solr_cluster="$solr_cluster", base_url=~"$base_url"' % cfg;
+    local getMatcher(cfg) = '%(solrSelector)s, solr_cluster=~"$solr_cluster", base_url=~"$base_url"' % cfg;
     {
       grafanaDashboards+:: {
@@ Expand Down @@